Merge branch 'master' into for-yx

license/doc/update.2023.1.sql → license/doc/db/update.2023.1.sql

@@ -26,7 +26,7 @@ CREATE TABLE `user_permission`
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT ='用户权限表';
 
---添加权限--
+-- 添加权限 --
 INSERT INTO `permission` (`id`, `description`, `create_time`, `update_time`, `deleted`)
 VALUES (1, '邀请注册', NULL, NULL, 0);
 INSERT INTO `permission` (`id`, `description`, `create_time`, `update_time`, `deleted`)

license/src/main/resources/mapper/PmsUseLogMapper.xml

@@ -14,21 +14,21 @@
             </foreach>
         </if>
         <if test="startTime != null and startTime != ''">
-            AND create_time &gt; #{startTime}
+            AND pms_use_log.create_time &gt; #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            AND create_time &lt; #{endTime}
+            AND pms_use_log.create_time &lt; #{endTime}
         </if>
         <if test="null != sn and '' != sn">
-            and sn like concat('%',#{sn},'%')
+            and pms_use_log.sn like concat('%',#{sn},'%')
         </if>
         <if test="null != status and status == 0">
-            and status = #{status}
+            and pms_use_log.status = #{status}
         </if>
         <if test="null != status and status == 1">
-            and (status = #{status} or status is null)
+            and (pms_use_log.status = #{status} or pms_use_log.status is null)
         </if>
-        and deleted = 0
-        order by create_time desc
+        and pms_use_log.deleted = 0
+        order by pms_use_log.create_time desc
     </select>
 </mapper>
\ No newline at end of file