添加修改公司消息

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -134,6 +134,14 @@ public class CompanyServiceImpl implements CompanyService {
             resVo.setCompanyVo(companyVo);
         }
 
+         /*获取公司扩展表信息*/
+        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
+        companyExtendGetReqVo.setId(reqVo.getId());
+        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
+        if (null != companyExtendVo) {
+            resVo.setCompanyExtendVo(companyExtendVo);
+        }
+
         /*此处需要根据公司id和productOrInterface获取商户信息*/
         CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
         companyScenicInfoReqVo.setCompanyId(companyVo.getId());
@@ -148,13 +156,7 @@ public class CompanyServiceImpl implements CompanyService {
             resVo.setMerchant(null);
         }
 
-        /*获取公司扩展表信息*/
-        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
-        companyExtendGetReqVo.setId(reqVo.getId());
-        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
-        if (null != companyExtendVo) {
-            resVo.setCompanyExtendVo(companyExtendVo);
-        }
+
         /*获取公司银行卡列表*/
         CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
         companyBankCardGetReqVo.setCompanyId(reqVo.getId());

src/main/resources/bootstrap.yml

@@ -4,10 +4,6 @@ spring:
   application:
     name: pd-user
   cloud:
-     #datasource:
-      # url: jdbc:mysql://192.168.0.205:3306/pd_manager?useUnicode=true&characterEncoding=utf-8&characterSetResults=utf-8&zeroDateTimeBehavior=convertToNull
-      # username: root
-      # password: 123456
     config:
       # base为所有服务的公共配置，pd-db-system为需要连接的数据库配置,${spring.application.name}为当前程序的配置，3个配置组合才为当前程序的启动配置
       name: base,pd-db-user,${spring.application.name}