瀏覽代碼

采购合同备案程序上传

张庆宇 1 天之前
父節點
當前提交
dae2ad3884

+ 5
- 0
src/main/java/com/example/backend/entity/pccontract/PCcontractDtl.java 查看文件

119
 
119
 
120
     @TableField("dept_id")
120
     @TableField("dept_id")
121
     private String deptId;
121
     private String deptId;
122
+<<<<<<< HEAD
122
     //@TableField("fchno")
123
     //@TableField("fchno")
123
     //private int fchno;
124
     //private int fchno;
125
+=======
126
+    @TableField("fchno")
127
+    private int fchno;
128
+>>>>>>> 330ff25 (采购合同备案程序上传)
124
     @TableField(exist = false)
129
     @TableField(exist = false)
125
 
130
 
126
     private List<PCcontractDtl> purchaseDtls;
131
     private List<PCcontractDtl> purchaseDtls;

+ 3
- 0
src/main/java/com/example/backend/entity/pccontract/PCcontractRCenterDtl.java 查看文件

29
     @TableField("assessRatio")
29
     @TableField("assessRatio")
30
     private BigDecimal assessRatio;
30
     private BigDecimal assessRatio;
31
 
31
 
32
+<<<<<<< HEAD
32
     @TableField("assessQtyRate")
33
     @TableField("assessQtyRate")
33
     private BigDecimal assessQtyRate;
34
     private BigDecimal assessQtyRate;
34
 
35
 
36
+=======
37
+>>>>>>> 330ff25 (采购合同备案程序上传)
35
     @TableField("assessAmt")
38
     @TableField("assessAmt")
36
     private BigDecimal assessAmt;
39
     private BigDecimal assessAmt;
37
 
40
 

Loading…
取消
儲存