Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

src/main/java/com/sqx/modules/artificer/entity/Orders.java

@@ -305,10 +305,44 @@ public class Orders implements Serializable {
      * 用户服务包明细ID
      */
     private Long userPackageDetailId;
+
+    /**
+     * 会员优惠比例
+     */
+    private BigDecimal vipRate;
+    /**
+     * 技师等级
+     */
+    private Integer technicianType;
+    /**
+     * 技师等级加成比例
+     */
+    private BigDecimal technicianRate;
+    /**
+     * 项目金额或项目差额
+     */
+    private BigDecimal massageMoney;
     /**
      * 拒单内容
      */
     private String refusalContent;
+    /**
+     * 订单提前结束原因
+     */
+    private String earlyFinishReason;
+    /**
+     * 是否是待补单生成 1是 2否-修改单据产生
+     */
+    private Integer isSupplement;
+    /**
+     * 原订单ID
+     */
+    private Long oldOrdersId;
+    /**
+     * 原项目金额
+     */
+    private BigDecimal oldMassageMoney;
+
 
     /**
      * 技师完成服务承诺  多个按照逗号分割
@@ -384,12 +418,6 @@ public class Orders implements Serializable {
     @TableField(exist = false)
     private String shopPhone;
 
-    /**
-     * 会员优惠比例
-     */
-    @TableField(exist = false)
-    private BigDecimal vipRate;
-
 
     @TableField(exist = false)
     private String userRecharge;