diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java index 392b3fb3..2a02e82a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java @@ -177,6 +177,16 @@ public class ErpContractInfo extends TenantEntity { */ private String remark; + /** + * 签订地点 + */ + private String signingPlace; + + /** + * 合同物料备注 + */ + private String materialRemark; + /** * 激活标识(1是 0否) */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java index 8e38cf06..9db0b6d1 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java @@ -179,6 +179,16 @@ public class ErpContractInfoBo extends BaseEntity { */ private String remark; + /** + * 签订地点 + */ + private String signingPlace; + + /** + * 合同物料备注 + */ + private String materialRemark; + /** * 激活标识(1是 0否) */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java index d65bc7dd..fe1d0e1f 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java @@ -218,6 +218,18 @@ public class ErpContractInfoVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 签订地点 + */ + @ExcelProperty(value = "签订地点") + private String signingPlace; + + /** + * 合同物料备注 + */ + @ExcelProperty(value = "合同物料备注") + private String materialRemark; + /** * 激活标识(1是 0否) */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml index 05e6bc30..87e14550 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml @@ -38,6 +38,8 @@ t.warranty_period, t.tax_rate, t.remark, + t.signing_place, + t.material_remark, t.active_flag, t.contract_manager_id, t.capitalized_amount,