Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts:
# README.md
# pom.xml
# ruoyi-api/pom.xml
# ruoyi-api/ruoyi-api-system/pom.xml
# ruoyi-auth/pom.xml
# ruoyi-common/pom.xml
# ruoyi-common/ruoyi-common-core/pom.xml
# ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
# ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
# ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
# ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
# ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
# ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
# ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
# ruoyi-common/ruoyi-common-excel/pom.xml
# ruoyi-common/ruoyi-common-job/pom.xml
# ruoyi-common/ruoyi-common-log/pom.xml
# ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
# ruoyi-common/ruoyi-common-mybatis/pom.xml
# ruoyi-common/ruoyi-common-redis/pom.xml
# ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
# ruoyi-common/ruoyi-common-security/pom.xml
# ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
# ruoyi-example/ruoyi-stream-mq/pom.xml
# ruoyi-gateway/pom.xml
# ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
# ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
# ruoyi-modules/pom.xml
# ruoyi-modules/ruoyi-gen/pom.xml
# ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
# ruoyi-modules/ruoyi-job/pom.xml
# ruoyi-modules/ruoyi-system/pom.xml
# ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
# ruoyi-ui/package.json
# ruoyi-ui/src/views/index.vue
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/register.vue
# ruoyi-visual/pom.xml
# ruoyi-visual/ruoyi-monitor/pom.xml
|
疯狂的狮子li
RuoYi
Sxile