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

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -666,6 +666,9 @@ public class WorkerManagerLogic {
 
         }
 
+        workerManagerBean.setExamineBy(adminUser.getNickName());
+        workerManagerBean.setExamineTime(new Date());
+
         workerManagerBean.updateById();
         workerManagerBean.getUser().updateById();
 
@@ -800,7 +803,8 @@ public class WorkerManagerLogic {
         workerManagerBean.setPolicyExamineBy(adminUser.getNickName());
         workerManagerBean.setPolicyExamineTime(new Date());
 
-
+        workerManagerBean.setPolicyExamineBy(adminUser.getNickName());
+        workerManagerBean.setPolicyExamineTime(new Date());
         workerManagerBean.setBankAccount(workerManagerBean.getUser().getBankAccount());
         workerManagerBean.setWorkerNumber(workerManagerBean.getUser().getWorkerNumber());
 
@@ -955,7 +959,8 @@ public class WorkerManagerLogic {
 
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds())
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds())
                 , WebsitUser::getWebsitId, adminUser.getAdminWebsitIds())
                 .list();