Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

This commit is contained in:
JR
2025-08-15 16:17:30 +08:00

View File

@@ -12,8 +12,6 @@
<result property="storageTime" column="storage_time"/> <result property="storageTime" column="storage_time"/>
<result property="expirationDate" column="expiration_date"/> <result property="expirationDate" column="expiration_date"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="operatorId" column="operator_id"/>
<result property="lastUpdate" column="last_update"/>
<result property="delFlag" column="del_flag"/> <result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/> <result property="createBy" column="create_by"/>
@@ -62,12 +60,6 @@
<if test="bo.status != null and bo.status != ''"> <if test="bo.status != null and bo.status != ''">
AND s.status = #{bo.status} AND s.status = #{bo.status}
</if> </if>
<if test="bo.operatorId != null">
AND s.operator_id = #{bo.operatorId}
</if>
<if test="bo.lastUpdate != null">
AND s.last_update = #{bo.lastUpdate}
</if>
</where> </where>
</select> </select>