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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -421,7 +421,7 @@ public class WorkerLogic {
 
         List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery()
                 .eq(WorkerPolicy::getWebsitId, websitId)
-                .eq(WorkerPolicy::getWorkerId, currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WorkerPolicy::getWebsitUserId, websiUser.getId())
                 .eq(WorkerPolicy::getPolicyType, "AC")
                 .orderByDesc(WorkerPolicy::getEndTime)
                 .list();

mall-server-api/src/main/java/com/gree/mall/manager/enums/SettlementGoodsTypeEnum.java

@@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public enum  SettlementGoodsTypeEnum implements BaseEnum {
     MCC("MCC","辅材"),
-    ACC("ACC","ACC");
+    ACC("ACC","配件");
 
 
     @EnumValue