Merge branch 'developer' into 'master'

Developer

See merge request !31

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AuditLogApiServiceImpl.java

@@ -371,7 +371,8 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
         // todo 跳转地址
         String url;
         if (AuditTypeEnum.HAOBAN.getCode().equals(auditLogDTO.getAuditType())) {
-            url = String.format("%s%s?auditLogId=%d&openid=%s", config.getHost(), auditLogDTO.getAuditUrl(), auditLogDTO.getAuditLogId(), auditorDTO.getOpenid());
+            url = String.format("%s%s?auditLogId=%d&openid=%s&auditorId=%s&auditorName=%s",
+                    config.getHost(), auditLogDTO.getAuditUrl(), auditLogDTO.getAuditLogId(), auditorDTO.getOpenid(), auditorDTO.getAuditorId(), auditorDTO.getAuditorName());
             if (StringUtils.isNotBlank(auditLogDTO.getExtraInfo())) {
                 JSONObject jsonObject = JSON.parseObject(auditLogDTO.getExtraInfo());
                 StringBuilder sb = new StringBuilder();

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java

@@ -81,7 +81,7 @@ public class WmStoreSyncController {
         BUSINESS_TIME_MAP.put("4", "周四");
         BUSINESS_TIME_MAP.put("5", "周五");
         BUSINESS_TIME_MAP.put("6", "周六");
-        BUSINESS_TIME_MAP.put("7", "周七");
+        BUSINESS_TIME_MAP.put("7", "周日");
     }
 
     @Autowired