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

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/CompanyCaAuthLogic.java

@@ -62,7 +62,7 @@ public class CompanyCaAuthLogic {
         final AdminWebsit websit = adminWebsitService.getById(companyCaAuth.getWebsitId());
         companyCaAuth.setCompanyName(websit.getName());
         companyCaAuth.setCompanyWechatId(websit.getCompanyWechatId());
-        companyCaAuth.setCompanyName(websit.getCompanyWechatName());
+        companyCaAuth.setCompanyWechatName(websit.getCompanyWechatName());
         CompanyCaAuth caAuth = companyCaAuthService.lambdaQuery()
                 .eq(CompanyCaAuth::getWebsitId, companyCaAuth.getWebsitId())
                 .one();
@@ -90,7 +90,7 @@ public class CompanyCaAuthLogic {
         final AdminWebsit websit = adminWebsitService.getById(companyCaAuth.getWebsitId());
         companyCaAuth.setCompanyName(websit.getName());
         companyCaAuth.setCompanyWechatId(websit.getCompanyWechatId());
-        companyCaAuth.setCompanyName(websit.getCompanyWechatName());
+        companyCaAuth.setCompanyWechatName(websit.getCompanyWechatName());
         this.checkInfo(companyCaAuth);
         CompanyCaAuth byId = companyCaAuthService.getById(companyCaAuth.getCompanyCaAuthId());
 
@@ -139,7 +139,7 @@ public class CompanyCaAuthLogic {
         }
         if (!c1.getCompanyAddress().trim().equals(c2.getCompanyAddress().trim())) {
             c2.setCompanyAddress(c1.getCompanyAddress().trim());
-            flag = true;
+//            flag = true;
         }
         if (!c1.getTaxNo().trim().equals(c2.getTaxNo().trim())) {
             c2.setTaxNo(c1.getTaxNo().trim());