From 2d0f571fabe7adf11d8ad4dfa981d742ffbdce6c Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Fri, 8 Dec 2023 09:06:58 +0800
Subject: [PATCH] =?UTF-8?q?springboot=E5=8D=87=E7=BA=A7=E5=88=B0V3.1.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flex-ui/package.json                          |  2 +-
 flex-ui/src/views/index.vue                   |  4 +-
 pom.xml                                       |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 ruoyi-common/ruoyi-common-bom/pom.xml         |  2 +-
 .../resources/mapper/system/SysUserMapper.xml | 54 -------------------
 6 files changed, 7 insertions(+), 61 deletions(-)

diff --git a/flex-ui/package.json b/flex-ui/package.json
index 3233c25..b771f50 100644
--- a/flex-ui/package.json
+++ b/flex-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Ruoyi-Flex",
-  "version": "4.1.8",
+  "version": "4.2.0-SNAPSHOT",
   "description": "Ruoyi-Flex管理系统",
   "author": "数据小王子",
   "license": "MIT",
diff --git a/flex-ui/src/views/index.vue b/flex-ui/src/views/index.vue
index 66207bd..678faad 100644
--- a/flex-ui/src/views/index.vue
+++ b/flex-ui/src/views/index.vue
@@ -5,7 +5,7 @@
         <p align="center">
           <img alt="logo" src="@/assets/images/ruoyi-flex-logo.png">
         </p>
-        <h1 align="center">Ruoyi-Flex V4.1.8</h1>
+        <h1 align="center">Ruoyi-Flex V4.2.0-SNAPSHOT</h1>
         <h2 align="center">Ruoyi-Flex是基于Spring Boot V3平台 前后端分离的Java快速开发框架</h2>
       </el-col>
     </el-row>
@@ -245,7 +245,7 @@
 </template>
 
 <script setup>
-const version = ref('4.1.8')
+const version = ref('4.2.0-SNAPSHOT')
 
 function goTarget(url) {
   window.open(url, '__blank')
diff --git a/pom.xml b/pom.xml
index dda014e..ca4de31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,11 +13,11 @@
     <description>Ruoyi-Flex管理系统</description>
 
     <properties>
-        <revision>4.1.8</revision>
+        <revision>4.2.0-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot.version>3.1.5</spring-boot.version>
+        <spring-boot.version>3.1.6</spring-boot.version>
         <mybatis-flex.version>1.7.5</mybatis-flex.version>
         <satoken.version>1.37.0</satoken.version>
         <mysql.version>8.0.33</mysql.version>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9198465..b001bac 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@ ruoyi:
   # 名称
   name: Ruoyi-Flex
   # 版本
-  version: 4.1.8
+  version: 4.2.0
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index c692266..499c2c0 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <revision>4.1.8</revision>
+        <revision>4.2.0-SNAPSHOT</revision>
     </properties>
 
     <dependencyManagement>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index fb8cae2..606e7cc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,58 +4,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
-    <resultMap type="SysUser" id="SysUserResult">
-        <id     property="userId"       column="user_id"      />
-        <result property="tenantId"     column="tenant_id"      />
-        <result property="deptId"       column="dept_id"      />
-        <result property="userName"     column="user_name"    />
-        <result property="nickName"     column="nick_name"    />
-        <result property="userType"     column="user_type"    />
-        <result property="email"        column="email"        />
-        <result property="phonenumber"  column="phonenumber"  />
-        <result property="gender"       column="gender"          />
-        <result property="avatar"       column="avatar"       />
-        <result property="password"     column="password"     />
-        <result property="status"       column="status"       />
-        <result property="delFlag"      column="del_flag"     />
-        <result property="loginIp"      column="login_ip"     />
-        <result property="loginDate"    column="login_date"   />
-        <result property="createBy"     column="create_by"    />
-        <result property="createTime"   column="create_time"  />
-        <result property="updateBy"     column="update_by"    />
-        <result property="updateTime"   column="update_time"  />
-        <result property="remark"       column="remark"       />
-        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
-        <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
-    </resultMap>
-
-    <resultMap id="deptResult" type="SysDept">
-        <id     property="deptId"    column="dept_id"     />
-        <result property="parentId"  column="parent_id"   />
-        <result property="deptName"  column="dept_name"   />
-        <result property="ancestors" column="ancestors"   />
-        <result property="orderNum"  column="order_num"   />
-        <result property="leader"    column="leader"      />
-        <result property="status"    column="dept_status" />
-    </resultMap>
-
-    <resultMap id="RoleResult" type="SysRole">
-        <id     property="roleId"       column="role_id"        />
-        <result property="roleName"     column="role_name"      />
-        <result property="roleKey"      column="role_key"       />
-        <result property="roleSort"     column="role_sort"      />
-        <result property="dataScope"     column="data_scope"    />
-        <result property="status"       column="role_status"    />
-    </resultMap>
-
-	<sql id="selectUserVo">
-        select u.user_id, u.tenant_id,u.dept_id, u.user_name, u.nick_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.gender, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
-        from sys_user u
-		    left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id
-    </sql>
-
 </mapper>