From f5f16aac96772c109658b5ae1b48874008e0959a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 28 十月 2021 10:56:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2 +-
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 2 +-
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 4 ++--
pom.xml | 17 +++++++----------
ruoyi-common/pom.xml | 8 +++++++-
5 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 632c534..28e7efa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,13 @@
<version>${satoken.version}</version>
</dependency>
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
@@ -334,16 +341,6 @@
<module>ruoyi-oss</module>
</modules>
<packaging>pom</packaging>
-
-
- <dependencies>
- <!-- jdk11 缂哄け渚濊禆 jaxb-->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- </dependencies>
<build>
<plugins>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 283b985..1458c4f 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -86,6 +86,12 @@
<!-- <artifactId>jjwt</artifactId>-->
<!-- </dependency>-->
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+
<!-- redis 缂撳瓨鎿嶄綔 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -185,4 +191,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index c159016..24494ad 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -11,7 +11,7 @@
#else
#set($comment=$column.columnComment)
#end
-#if($column.htmlType == "input")
+#if($column.htmlType == "input" || $column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${column.javaField}">
<el-input
v-model="queryParams.${column.javaField}"
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 05a8baf..7e28c2e 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -11,7 +11,7 @@
#else
#set($comment=$column.columnComment)
#end
-#if($column.htmlType == "input")
+#if($column.htmlType == "input" || $column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${column.javaField}">
<el-input
v-model="queryParams.${column.javaField}"
@@ -163,7 +163,7 @@
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index e1bd9cc..788992a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -170,7 +170,7 @@
}
/**
- * 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
+ * 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
*
* @param user 鐢ㄦ埛淇℃伅
* @return
--
Gitblit v1.9.3