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

 Conflicts:
	sql/ruoyi-vue-pro.sql
pull/2/head
YunaiV 2022-02-27 23:56:23 +08:00
commit b845d62e8b
1 changed files with 1 additions and 1 deletions

View File

@ -11,7 +11,7 @@
Target Server Version : 80026 Target Server Version : 80026
File Encoding : 65001 File Encoding : 65001
Date: 27/02/2022 16:28:08 Date: 27/02/2022 16:31:44
*/ */
SET NAMES utf8mb4; SET NAMES utf8mb4;