Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable

Conflicts: sql/ruoyi-vue-pro.sql
2022-02-27 23:56:23 +08:00 · 2022-02-27 23:56:23 +08:00 · b845d62e8b
parent 5d90760c39 bf37095259
commit b845d62e8b
1 changed files with 1 additions and 1 deletions
--- a/sql/ruoyi-vue-pro.sql
+++ b/sql/ruoyi-vue-pro.sql
@ -11,7 +11,7 @@
 Target Server Version : 80026
 File Encoding         : 65001

- Date: 27/02/2022 16:28:08
+ Date: 27/02/2022 16:31:44
 */

 SET NAMES utf8mb4;