实体类型转换代码提交，以及

pom.xml <url>http://192.168.0.203:8081/repository/pd-group/</url>
修改为  <url>http://maven.tbd.yanzuoguang.com/repository/pd-group/</url>

pom.xml

@@ -26,7 +26,7 @@
     <repositories>
         <repository>
             <id>pd</id>
-            <url>http://192.168.0.203:8081/repository/pd-group/</url>
+            <url>http://maven.tbd.yanzuoguang.com/repository/pd-group/</url>
             <snapshots>
                 <enabled>true</enabled>
                 <updatePolicy>always</updatePolicy>

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

@@ -20,6 +20,7 @@ public class CompanyMoneyServiceImpl implements CompanyMoneyService {
      * @param req
      * @return
      */
+    @Override
     public CompanyMoneyTotalResVo findCompanyMoney(CompanyMoneyReqVo req){
         CompanyMoneyTotalResVo companyMoneyTotalResVo = new CompanyMoneyTotalResVo();
 

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

@@ -309,11 +309,11 @@ public class CompanyServiceImpl implements CompanyService {
         merchantCreateReqVo.setProductCompanyId(companyVo.getId());
 
 
-        ResponseResult result1 = storeFeign.merchantCreate(merchantCreateReqVo);
+        ResponseResult<MerchantVo> result1 = storeFeign.merchantCreate(merchantCreateReqVo);
         if (null == result1 || !"00".equals(result1.getCode())) {
             throw new CodeException("获取失败，请重试");
         }
-        String merchantId = (String) result1.getData();
+        String merchantId =  result1.getData().getId();
         resVo.setMerchantId(merchantId);
 
         /*保存用户*/
@@ -444,7 +444,7 @@ public class CompanyServiceImpl implements CompanyService {
 
         resVo.setMerchantId(merchant.getId());
 
-        ResponseResult result2 = storeFeign.merchantCreate(merchantCreateReqVo);
+        ResponseResult<MerchantVo> result2 = storeFeign.merchantCreate(merchantCreateReqVo);
         if (null == result2 || !"00".equals(result2.getCode())) {
             throw new CodeException("验证失败，请重试");
         }

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

@@ -220,9 +220,9 @@ public class RegisterServiceImpl implements RegisterService {
             req.setId(reqVo.getMerchantId());
         }
         SaveCompanyResVo resVo = new SaveCompanyResVo();
-        ResponseResult result1 = storeFeign.merchantCreate(req);
+        ResponseResult<MerchantVo> result1 = storeFeign.merchantCreate(req);
         if (result1.getCode().equals("00")) {
-            String merchantId = (String) result1.getData();
+            String merchantId = result1.getData().getId();
             resVo.setMerchantId(merchantId);
         }
 
@@ -337,9 +337,10 @@ public class RegisterServiceImpl implements RegisterService {
             req.setAddress(reqVo.getMerchantAddress());
         }
 
-        ResponseResult result1 = storeFeign.merchantCreate(req);
+        ResponseResult<MerchantVo> result1 = storeFeign.merchantCreate(req);
         if (result1.getCode().equals("00")) {
-            String merchantId = (String) result1.getData();
+//            String merchantId = (String) result1.getData();
+            String merchantId = result1.getData().getId();
             resVo.setMerchantId(merchantId);
         }