采购合同备案程序上传

src/main/java/com/example/backend/entity/pccontract/PCcontractDtl.java

@@ -119,8 +119,13 @@ public class PCcontractDtl extends BaseModelPur {
 
     @TableField("dept_id")
     private String deptId;
+<<<<<<< HEAD
     //@TableField("fchno")
     //private int fchno;
+=======
+    @TableField("fchno")
+    private int fchno;
+>>>>>>> 330ff25 (采购合同备案程序上传)
     @TableField(exist = false)
 
     private List<PCcontractDtl> purchaseDtls;

src/main/java/com/example/backend/entity/pccontract/PCcontractRCenterDtl.java

@@ -29,9 +29,12 @@ public class PCcontractRCenterDtl extends BaseModelPur {
     @TableField("assessRatio")
     private BigDecimal assessRatio;
 
+<<<<<<< HEAD
     @TableField("assessQtyRate")
     private BigDecimal assessQtyRate;
 
+=======
+>>>>>>> 330ff25 (采购合同备案程序上传)
     @TableField("assessAmt")
     private BigDecimal assessAmt;