From baad6b6254b2de028c04c46338286060a9f42b65 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 20 二月 2025 14:04:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 1 -
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml | 21 +--------------------
2 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 46f9630..64efe6a 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -348,7 +348,6 @@
@ApiOperation(value = "管理员-我的审批-审批")
@GetMapping("/examine")
public R examine(@RequestParam String id){
-
return R.ok();
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
index 342f103..385b4d0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
@@ -82,26 +82,7 @@
</select>
<select id="pageListApplet" resultType="com.ruoyi.system.vo.TCheckAcceptRecordVO">
select
- t.id,
- t.contract_id,
- t.house_id,
- t.check_time,
- t.lease_reason,
- t.check_person,
- t.accompany_person,
- t.overall_situation,
- t.furniture_situation,
- t.device_situation,
- t.clean_situation,
- t.other_problem,
- t.pictures,
- t.check_result,
- t.check_money,
- t.create_time,
- t.update_time,
- t.create_by,
- t.update_by,
- t.disabled,
+ t1.*,
c.contract_number,
h.house_name
from t_check_accept_record t
--
Gitblit v1.7.1