Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/lock/LockBusiness.java

@@ -49,6 +49,7 @@ public class LockBusiness {
      * @return 发卡数据
      */
     public R<String> getWriteCardData(RoomCardBo bo) {
+        log.debug("发卡入参：{}, {}", JSONUtil.toJsonStr(bo),bo.getCardType());
         Integer cardType = bo.getCardType();
         String cardData = "";
         Map<String, Object> formMap;

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfCreditAccountMapper.xml

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 )
             ) temp
         <where>
-            <if test="startTime != null and endTime != null">
+            <if test="startTime != null and endTime != null and startTime !='' and endTime !=''">
                 AND creditTime BETWEEN #{startTime} AND #{endTime}
             </if>
         </where>