Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -434,16 +434,14 @@
   </select>
 
   <select id="listAll" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
-    SELECT a.store_id,
-           a.wx_enterprise_id,
-           a.wx_user_id,
-           a.staff_id,
-           a.clerk_id,
-           b.staff_name,
-           c.store_name
+    SELECT a.store_id         storeId,
+           a.wx_enterprise_id wxEnterpriseId,
+           a.wx_user_id       wxUserId,
+           a.staff_id         staffId,
+           a.clerk_id         clerkId,
+           b.staff_name       staffName
     FROM tab_haoban_staff_clerk_relation a
            LEFT JOIN tab_haoban_staff b ON b.staff_id = a.staff_id
-           LEFT JOIN tab_gic_clerk c ON c.clerk_id = a.clerk_id
     WHERE a.status_flag = 1
     GROUP BY a.staff_id
   </select>