Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java

@@ -106,4 +106,9 @@ public class CustomerMain extends TenantBaseDO {
      */
     private String memberLevelId;
 
+    /**
+     * 是否挂账
+     */
+    private String isHangAccount;
+
 }

dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml

@@ -34,6 +34,7 @@
         main.near_do_time AS nearDoTime,
         main.near_do_content AS nearDoContent,
         main.inviter AS inviter,
+        main.is_hang_account AS isHangAccount,
         main.inviter_type AS inviterType,
         main.status AS status,
         group_concat(item.ser_content) AS serContents,
@@ -102,6 +103,8 @@
         main.near_do_content AS nearDoContent,
         main.inviter AS inviter,
         main.inviter_type AS inviterType,
+        main.member_level_id AS memberLevelId,
+        main.is_hang_account AS isHangAccount,
         main.STATUS AS STATUS,
         group_concat( item.ser_content ) AS serContents,
         memberLevel.NAME AS levelName,

dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairRecordsController.java

@@ -61,7 +61,7 @@ public class RepairRecordsController {
 
     /**
      * 维修工查询维修记录
-     * @param pageReqVO 维修工分页查询条件
+     * @param pageReqVO
      *
      */
     @GetMapping("/page")