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

Conflicts: sql/ruoyi-vue-pro.sql

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/flowable
Conflicts: sql/ruoyi-vue-pro.sql
YunaiV
2 parents 5d90760c bf370952
Showing 1 changed file with 1 additions and 1 deletions
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;