Commit 00798feda7542269bd77ab27850ac8d99b35c983
1 parent
40963d63
fix(crm): 将产品及商机、合同中的单位字段统一为原始类型 int
Showing
5 changed files
with
5 additions
and
5 deletions
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
| @@ -125,7 +125,7 @@ public class CrmBusinessRespVO { | @@ -125,7 +125,7 @@ public class CrmBusinessRespVO { | ||
| 125 | @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529") | 125 | @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529") |
| 126 | private String productNo; | 126 | private String productNo; |
| 127 | @Schema(description = "产品单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") | 127 | @Schema(description = "产品单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") |
| 128 | - private Integer productUnit; | 128 | + private int productUnit; |
| 129 | 129 | ||
| 130 | @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00") | 130 | @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00") |
| 131 | private BigDecimal productPrice; | 131 | private BigDecimal productPrice; |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
| @@ -143,7 +143,7 @@ public class CrmContractRespVO { | @@ -143,7 +143,7 @@ public class CrmContractRespVO { | ||
| 143 | @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529") | 143 | @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529") |
| 144 | private String productNo; | 144 | private String productNo; |
| 145 | @Schema(description = "产品单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") | 145 | @Schema(description = "产品单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") |
| 146 | - private Integer productUnit; | 146 | + private int productUnit; |
| 147 | 147 | ||
| 148 | @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00") | 148 | @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00") |
| 149 | private BigDecimal productPrice; | 149 | private BigDecimal productPrice; |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductRespVO.java
| @@ -35,7 +35,7 @@ public class CrmProductRespVO implements VO { | @@ -35,7 +35,7 @@ public class CrmProductRespVO implements VO { | ||
| 35 | @Schema(description = "单位", example = "2") | 35 | @Schema(description = "单位", example = "2") |
| 36 | @ExcelProperty(value = "单位", converter = DictConvert.class) | 36 | @ExcelProperty(value = "单位", converter = DictConvert.class) |
| 37 | @DictFormat(DictTypeConstants.CRM_PRODUCT_UNIT) | 37 | @DictFormat(DictTypeConstants.CRM_PRODUCT_UNIT) |
| 38 | - private Integer unit; | 38 | + private int unit; |
| 39 | 39 | ||
| 40 | @Schema(description = "价格, 单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911") | 40 | @Schema(description = "价格, 单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911") |
| 41 | @ExcelProperty("价格,单位:分") | 41 | @ExcelProperty("价格,单位:分") |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
| @@ -28,7 +28,7 @@ public class CrmProductSaveReqVO { | @@ -28,7 +28,7 @@ public class CrmProductSaveReqVO { | ||
| 28 | 28 | ||
| 29 | @Schema(description = "单位", example = "2") | 29 | @Schema(description = "单位", example = "2") |
| 30 | @DiffLogField(name = "单位", function = CrmProductUnitParseFunction.NAME) | 30 | @DiffLogField(name = "单位", function = CrmProductUnitParseFunction.NAME) |
| 31 | - private Integer unit; | 31 | + private int unit; |
| 32 | 32 | ||
| 33 | @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911") | 33 | @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911") |
| 34 | @NotNull(message = "价格不能为空") | 34 | @NotNull(message = "价格不能为空") |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/product/CrmProductDO.java
| @@ -43,7 +43,7 @@ public class CrmProductDO extends BaseDO { | @@ -43,7 +43,7 @@ public class CrmProductDO extends BaseDO { | ||
| 43 | * | 43 | * |
| 44 | * 字典 {@link DictTypeConstants#CRM_PRODUCT_UNIT} | 44 | * 字典 {@link DictTypeConstants#CRM_PRODUCT_UNIT} |
| 45 | */ | 45 | */ |
| 46 | - private Integer unit; | 46 | + private int unit; |
| 47 | /** | 47 | /** |
| 48 | * 价格,单位:元 | 48 | * 价格,单位:元 |
| 49 | */ | 49 | */ |