Commit 9520f7e5 by YG8999

Merge remote-tracking branch 'origin/main'

parents 5c90de78 cd70fba8
...@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roomId != null"> and t1.room_id = #{roomId}</if> <if test="roomId != null"> and t1.room_id = #{roomId}</if>
<if test="storeId != null"> and t1.store_id = #{storeId}</if> <if test="storeId != null"> and t1.store_id = #{storeId}</if>
</where> </where>
ORDER BY create_time DESC
</select> </select>
<select id="selectSCleanRecordsById" parameterType="Long" resultMap="SCleanRecordsResult"> <select id="selectSCleanRecordsById" parameterType="Long" resultMap="SCleanRecordsResult">
......
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
<if test="isDelete != null "> and is_delete = #{isDelete}</if> <if test="isDelete != null "> and is_delete = #{isDelete}</if>
<if test="deleteBy != null and deleteBy != ''"> and delete_by = #{deleteBy}</if> <if test="deleteBy != null and deleteBy != ''"> and delete_by = #{deleteBy}</if>
<if test="deleteTime != null "> and delete_time = #{deleteTime}</if> <if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
ORDER BY create_time DESC
</where> </where>
</select> </select>
......
...@@ -117,6 +117,7 @@ ...@@ -117,6 +117,7 @@
<if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if> <if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if>
<if test="updateTime != null and updateTime != ''">and update_time = #{updateTime}</if> <if test="updateTime != null and updateTime != ''">and update_time = #{updateTime}</if>
<if test="remark != null and remark != ''">and remark = #{remark}</if> <if test="remark != null and remark != ''">and remark = #{remark}</if>
ORDER BY create_time DESC
</select> </select>
<select id="selectSOrderById" parameterType="Long" resultMap="SOrderResult"> <select id="selectSOrderById" parameterType="Long" resultMap="SOrderResult">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment