Merge branch 'dev_v1_1_20220720'

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/MallAdminApplication.java

@@ -23,6 +23,6 @@ import org.springframework.context.annotation.ComponentScan;
 @EnableFeignClients("com.yonge.cooleshow")
 public class MallAdminApplication {
     public static void main(String[] args) {
-        BaseApplication.run(AppConstant.APPLICATION_ADMIN, MallAdminApplication.class, args);
+        BaseApplication.run(AppConstant.APPLICATION_MALL_ADMIN, MallAdminApplication.class, args);
     }
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/MallPortalApplication.java

@@ -19,7 +19,7 @@ import org.springframework.context.annotation.ComponentScan;
 public class MallPortalApplication {
 
     public static void main(String[] args) {
-        BaseApplication.run(AppConstant.APPLICATION_ADMIN, MallPortalApplication.class, args);
+        BaseApplication.run(AppConstant.APPLICATION_MALL_PORTAL, MallPortalApplication.class, args);
     }
 
 }