优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderTotalVO.java

@@ -1,5 +1,6 @@
 package com.yc.ship.module.trade.controller.admin.order.vo.order;
 
+import com.yc.ship.module.trade.framework.annotation.ForUpdate;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -121,6 +122,12 @@ public class TradeOrderTotalVO {
     @Schema(description = "其它费用说明")
     private String otherRemark;
 
+    @Schema(description = "16免1人数")
+    private Integer freeNum;
+
+    @Schema(description = "16免1金额")
+    private BigDecimal freeAmount;
+
     @Schema(description = "定金")
     private BigDecimal deposi;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderTotalDO.java

@@ -116,7 +116,7 @@ public class TradeOrderTotalDO extends TenantBaseDO {
     private Integer freeNum;
 
     @ForUpdate(fieldName = "16免1金额")
-    private Integer freeAmount;
+    private BigDecimal freeAmount;
 
     @ForUpdate(fieldName = "其它备注")
     private String otherRemark;