dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
364 changed files with 53769 additions and 1118 deletions
Showing only changes of commit 2cd4040431 - Show all commits

View File

@ -149,6 +149,7 @@
<if test="deviceCategory != null and deviceCategory != ''">
and ed.device_category = #{deviceCategory}
</if>
order by ed.device_id
</select>
<select id="getAllSiteId" resultType="String">