Merge branch 'master' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -116,6 +116,7 @@ public class ClerkController extends WebBaseController {
                     logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId, memberCount);
                     staffDTO.setMemberCount(memberCount);
                     staffDTO.setClerkId(clerk.getClerkId());
+                    staffDTO.setClerkCode(clerk.getClerkCode());
                     resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO));
                 }
             }