Merge remote-tracking branch 'origin/master'

12 months ago · ff9c7619af
5 changed files with 4 additions and 10 deletions
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
@ -62,8 +62,6 @@ public class AsOldparthandle extends BaseEntity {
    private String goodsSkuName; // 商品名称
 	@ApiModelProperty("图号")
    private String goodsSkuCode; // 图号
-	@ApiModelProperty("厂家")
-    private String manufacturerName; // 厂家
    @ApiModelProperty("供应商")
    private String supplierName;
 	@ApiModelProperty("规格")
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
@ -63,8 +63,6 @@ public class AsOldparthandleDetailsVo implements Vo {
    private String goodsSkuName; // 商品名称
 	@ApiModelProperty("图号")
    private String goodsSkuCode; // 图号
-	@ApiModelProperty("厂家")
-    private String manufacturerName; // 厂家
    @ApiModelProperty("供应商")
    private String supplierName;
 	@ApiModelProperty("规格")
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
@ -63,8 +63,6 @@ public class AsOldparthandleDto implements Dto {
    private String goodsSkuName; // 商品名称
 	@ApiModelProperty("图号")
    private String goodsSkuCode; // 图号
-	@ApiModelProperty("厂家")
-    private String manufacturerName; // 厂家
    @ApiModelProperty("供应商")
    private String supplierName;
 	@ApiModelProperty("规格")
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java
@ -61,8 +61,8 @@ public class AsOldparthandleQuery implements Query {
    private String goodsSkuName; // 商品名称
 	@ApiModelProperty("图号")
    private String goodsSkuCode; // 图号
-	@ApiModelProperty("厂家")
-    private String manufacturerName; // 厂家
+    @ApiModelProperty("供应商")
+    private String supplierName;
 	@ApiModelProperty("规格")
    private String goodsSkuOwnSpec; // 规格
 	@ApiModelProperty("单位")
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java
@ -63,8 +63,8 @@ public class AsOldparthandleVo implements Vo {
    private String goodsSkuName; // 商品名称
 	@ApiModelProperty("图号")
    private String goodsSkuCode; // 图号
-	@ApiModelProperty("厂家")
-    private String manufacturerName; // 厂家
+    @ApiModelProperty("供应商")
+    private String supplierName;
 	@ApiModelProperty("规格")
    private String goodsSkuOwnSpec; // 规格
 	@ApiModelProperty("单位")