Quellcode durchsuchen

订单,明细字段名称修改

koushanshan vor 1 Jahr
Ursprung
Commit
5d0dae0641

+ 3 - 3
src/main/java/com/dk/mdm/model/pojo/sale/Order.java

@@ -341,10 +341,10 @@ public class Order extends PageInfo<Order> implements Serializable {
     private Integer cpId;
 
     /**
-     * 实金额
+     * 实金额
      */
-    @Excel(name = "实金额")
-    @ApiModelProperty(value = "实金额")
+    @Excel(name = "实金额")
+    @ApiModelProperty(value = "实金额")
     private BigDecimal factAmt;
 
     /**

+ 6 - 6
src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -248,17 +248,17 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     private Integer decimalPlaces;
 
     /**
-     * 实际单价
+     * 优惠后单价
      */
-    @Excel(name = "实际单价")
-    @ApiModelProperty(value = "实际单价")
+    @Excel(name = "优惠后单价")
+    @ApiModelProperty(value = "优惠后单价")
     private BigDecimal factPrice;
 
     /**
-     * 实际金额
+     * 优惠后金额
      */
-    @Excel(name = "实际金额")
-    @ApiModelProperty(value = "实际金额")
+    @Excel(name = "优惠后金额")
+    @ApiModelProperty(value = "优惠后金额")
     private BigDecimal factAmt;
 
     /**

+ 6 - 6
src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -384,17 +384,17 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
 
 
     /**
-     * 实际单价
+     * 优惠后单价
      */
-    @Excel(name = "实际单价")
-    @ApiModelProperty(value = "实际单价")
+    @Excel(name = "优惠后单价")
+    @ApiModelProperty(value = "优惠后单价")
     private BigDecimal factPrice;
 
     /**
-     * 实际金额
+     * 优惠后金额
      */
-    @Excel(name = "实际金额")
-    @ApiModelProperty(value = "实际金额")
+    @Excel(name = "优惠后金额")
+    @ApiModelProperty(value = "优惠后金额")
     private BigDecimal factAmt;
 
     /**

+ 3 - 3
src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -349,10 +349,10 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
     private Boolean flgValid;
 
     /**
-     * 实金额
+     * 实金额
      */
-    @Excel(name = "实金额")
-    @ApiModelProperty(value = "实金额")
+    @Excel(name = "实金额")
+    @ApiModelProperty(value = "实金额")
     private BigDecimal factAmt;
 
     /**

+ 4 - 4
src/main/java/com/dk/mdm/model/vo/sale/OrderItemVO.java

@@ -255,15 +255,15 @@ public class OrderItemVO extends PageInfo<OrderItemVO> implements Serializable {
 
 
     /**
-     * 实际单价
+     * 优惠后单价
      */
-    @ApiModelProperty(value = "实际单价")
+    @ApiModelProperty(value = "优惠后单价")
     private BigDecimal factPrice;
 
     /**
-     * 实际金额
+     * 优惠后金额
      */
-    @ApiModelProperty(value = "实际金额")
+    @ApiModelProperty(value = "优惠后金额")
     private BigDecimal factAmt;
 
     /**

+ 1 - 1
src/main/java/com/dk/mdm/model/vo/sale/OrderVO.java

@@ -383,7 +383,7 @@ public class OrderVO extends PageInfo<OrderVO> implements Serializable {
     @ApiModelProperty(value = "自动办理参数")
     private Boolean flgHandleSetting;
 
-    @ApiModelProperty(value = "实金额")
+    @ApiModelProperty(value = "实金额")
     private BigDecimal factAmt;
 
     @ApiModelProperty(value = "优惠金额")