合同样品单下拉添加dataType

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -313,7 +313,7 @@ public class Contract extends BasePo {
      */
     @TableField(fill = FieldFill.INSERT)
     @Version
-    private Integer version;
+    private String version;
 
     /**
      * 交接单附件列表

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -214,6 +214,7 @@
             t1.id,
             t1.sell_corporation_id,
             t1.contract_type,
+            1 as dataType,
             t1.`code`,
             t1.buy_corporation_id,
             t1.version,
@@ -240,16 +241,16 @@
             t1.id,
             t1.sell_corporation_id,
             3 AS contract_type,
+            2 AS dataType,
             t1.`code`,
             t1.buy_corporation_id,
             t1.versions AS version,
             t1.amount,
-            t1.sumClaimMoney,
             t1.create_user,
             t1.create_time,
+            IF ( sumClaimMoney >= t1.amount, 20, IF ( sumClaimMoney != 0, 10, 0 ) ) AS refund_status,
             t1.`status`,
-            IF
-                ( sumClaimMoney >= t1.amount, 20, IF ( sumClaimMoney != 0, 10, 0 ) ) AS refund_status
+            t1.sumClaimMoney
         FROM
             (
                 SELECT