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

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -118,6 +118,7 @@ public class UserLogic {
 
         ZfireParamBean zfireParamBean = FieldUtils.supplyParam(userZfireParamBean, UserVO.class, adminUser);
 
+        // 用于工单查询当前主要师傅有组队关系的师傅
         List<String> slaveWorkerList = null;
         if (StringUtils.isNotBlank(userZfireParamBean.getMaserWorkerId())) {
             final List<WorkerTeam> teamList = workerTeamService.lambdaQuery()