jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ruoyi-vue/master' into dev

Browse Source 
# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
#	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
This commit is contained in:
疯狂的狮子li
2022-01-07 15:41:18 +08:00
parent 92653f3deb eb11337f7d
commit d9a0de20f8
7 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View File

@ -149,3 +149,4 @@ public interface Constants {
String SYS_DICT_KEY = "sys_dict:";
}