From 408bab8b1c0c10514b8395cff92e47751e4dcdcd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 07 三月 2026 11:28:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/projectManagement/PlanMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/projectManagement/PlanMapper.xml b/src/main/resources/mapper/projectManagement/PlanMapper.xml
index 3578358..de652e7 100644
--- a/src/main/resources/mapper/projectManagement/PlanMapper.xml
+++ b/src/main/resources/mapper/projectManagement/PlanMapper.xml
@@ -7,17 +7,17 @@
<resultMap id="BaseResultMap" type="com.ruoyi.projectManagement.pojo.Plan">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="describe" column="describe" jdbcType="VARCHAR"/>
+ <result property="description" column="description" jdbcType="VARCHAR"/>
<result property="attachment" column="attachment" jdbcType="VARCHAR"/>
- <result property="is_delete" column="is_delete" jdbcType="INTEGER"/>
- <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="update_time" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="create_user" column="create_user" jdbcType="VARCHAR"/>
- <result property="update_user" column="update_user" jdbcType="VARCHAR"/>
+ <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+ <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
- id,name,describe,
+ id,name,description,
attachment,is_delete,create_time,
update_time,create_user,update_user
</sql>
@@ -25,6 +25,7 @@
<select id="selectPlanPage" resultMap="BaseResultMap">
select t1.*
from project_management_plan as t1
+ where t1.is_delete = 0
order by t1.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3