dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
365 changed files with 54174 additions and 1121 deletions
Showing only changes of commit 9e086b77b5 - Show all commits

View File

@ -138,6 +138,7 @@
<select id="selectStrategyTempByTempId" parameterType="String" resultMap="EmsStrategyTempResult">
<include refid="selectEmsStrategyTempVo"/>
where template_id = #{templateId}
order by start_time, end_time
</select>
<delete id="deleteTempByTempId" parameterType="String">
@ -147,6 +148,7 @@
<select id="getTempListBySiteIdAndStrategyId" resultMap="EmsStrategyTempResult">
<include refid="selectEmsStrategyTempVo"/>
where site_id = #{siteId} and strategy_id = #{strategyId}
order by start_time, end_time
</select>
</mapper>