diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java index 94c26d43..131cbeaf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdAlterationInventory.java @@ -40,6 +40,11 @@ public class XzdAlterationInventory extends BaseEntity { */ private String code; + /** + * 合同类型(1、承包合同,2、分包合同,3、采购合同,4综合服务合同) + */ + private String contractType; + /** * 合同清单名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java index cf133a38..c2458554 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdAlterationInventoryBo.java @@ -44,6 +44,11 @@ public class XzdAlterationInventoryBo extends BaseEntity { */ private String contractListName; + /** + * 合同类型(1、承包合同,2、分包合同,3、采购合同,4综合服务合同) + */ + private String contractType; + /** * 项目名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java index 9ed06e24..00b346e4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdAlterationInventoryVo.java @@ -94,8 +94,12 @@ public class XzdAlterationInventoryVo implements Serializable { * 含税单价 */ @ExcelProperty(value = "含税单价") - private BigDecimal taxInclusiveUnitPrice; + + /** + * 合同类型(1、承包合同,2、分包合同,3、采购合同,4综合服务合同) + */ + private String contractType; /** * 本期结算数量 */