主菜单部分功能

pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MercMemberSetController.java

@@ -26,7 +26,7 @@ public class MercMemberSetController {
     @Autowired
     private MercMemberSetService mmsService;
 
-    @GetMapping
+    @GetMapping("/data")
     public Result<MercMemberSetVO> mercMemberSet() {
         MercMemberSetVO vo = mmsService.apiSet();
         return ResultGenerator.genSuccessResult(vo);

pluss-common-bundle/src/main/resources/config/application-common.yml

@@ -99,7 +99,7 @@ parameter:
   APPID: wxfffc7bff64c7a11e
   #小程序付款APPID
   APPLETS_APPID: wxfffc7bff64c7a11e
-  APPSECRET:
+  APPSECRET: b84ee0efaa0d9a649746ac65525f8e10
   KEY: 微信原生加密用的KEY
   LESHUALIU: 乐刷、未接入可不管
   LESHUA_API:

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelStatus.java

@@ -235,7 +235,7 @@ public class MerchantChannelStatus {
         }
 
         if (AUDIT_STATUS_EXAMINING.equals(status)) {
-            MsgException.throwException("进件审核中，请勿重复进件");
+            MsgException.throwException("进件审核中，请勿重复提交");
         }
     }