Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-10-28 f5f16aac96772c109658b5ae1b48874008e0959a

Merge remote-tracking branch 'origin/dev' into satoken

# Conflicts:
#	ruoyi-common/pom.xml

 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>

 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>
</project>

 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}"

 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"

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -170,7 +170,7 @@
    }

    /**
     * 校验用户名称是否唯一
     * 校验手机号码是否唯一
     *
     * @param user 用户信息
     * @return