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

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyPayConfigLogic.java

@@ -68,6 +68,10 @@ public class AdminCompanyPayConfigLogic {
             throw new RemoteServiceException("子商户mchid不能为空");
         }
 
+        if (StringUtils.isBlank(bean.getSubAppId())) {
+            throw new RemoteServiceException("子商户appid不能为空");
+        }
+
         if (StringUtils.isBlank(bean.getMchKey())) {
             throw new RemoteServiceException("key不能为空");
         }