Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/AppCompanyShuntingListVo.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.base.api.baseinternalpurchase;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -45,6 +44,5 @@ public class AppCompanyShuntingListVo implements Vo {
 
     @ApiModelProperty("sid")
     private String sid;
-    @JsonProperty("CarDetailPage")
-    private AppVehicleVersionVo CarDetailPage;
+    private AppVehicleVersionVo carDetailPage;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingList.java

@@ -54,6 +54,5 @@ public class CompanyShuntingList implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
 
-    @JsonProperty("CarDetailPage")
-    private CompanyShutingVersionVo CarDetailPage;
+    private CompanyShutingVersionVo carDetailPage;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/CompanyShuntingVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.supplychain.companyShunting;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,8 +25,10 @@ public class CompanyShuntingVo implements Vo {
 
     private String procInsId;
     @ApiModelProperty("调入分公司名称")
+    @JsonProperty("company2")
     private String buyerOrgName;
     @ApiModelProperty("调出分公司名称")
+    @JsonProperty("company")
     private String sellerOrgName;
     @ApiModelProperty("调车类型key")
     private String shuntingTypeKey;