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

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

@@ -476,7 +476,7 @@
                   #{item}
                 </foreach>
             and status_flag = 1
-          group by staff_id) as scr
+            group by staff_id, wx_user_id, clerk_id) as scr
            left join tab_haoban_external_clerk_related as ecr on scr.staff_id = ecr.staff_id
     where ecr.status_flag = 1
       and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}