From c3ac3682cac1d5dc3f2310418502c1c96ffe5a7e Mon Sep 17 00:00:00 2001 From: yupeng <roc__yu@163.com> Date: 星期五, 07 二月 2025 11:02:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun --- ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml index fa1131b..738ee8a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml @@ -36,7 +36,9 @@ <!-- 通用查询结果列 --> <sql id="Base_Column_List"> - id, contract_number, contract_name, start_time, end_time, total_rent, deposit, pay_type, first_pay_time, isIncreasing, isIncreasing_deposit, proportion, house_id, party_one_name, party_one_person, party_one_phone, tenant_id, party_two_name, party_two_person, party_two_phone, contract_file, remark, status, create_time, update_time, create_by, update_by, disabled + id, contract_number, contract_name, start_time, end_time, total_rent, deposit, pay_type, first_pay_time, isIncreasing, isIncreasing_deposit, + proportion, house_id, party_one_name, party_one_person, party_one_phone, tenant_id, party_two_name, party_two_person, party_two_phone, + contract_file, remark, status, create_time, update_time, create_by, update_by, disabled </sql> <select id="contractList" resultType="com.ruoyi.system.model.TContract"> select t1.* from t_contract t1 -- Gitblit v1.7.1