Merge remote-tracking branch 'origin/master'

wuzeyu

2024-01-26 3948f4fc637d8439bc2a2e44c449e968b3c0fb15

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml

@@ -361,6 +361,10 @@
      <if test = "operateTimeStart != null and operateTimeStop != null">
        AND ope.operate_dt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
      </if>

      <if test = "cashierId != null and cashierId > 0">
        AND user.id = ${cashierId}
      </if>
    </where>
    ORDER BY ope.operate_dt
    <if test="pageCurr != null and pageSize != null">