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

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

 Conflicts:
	sql/ruoyi-vue-pro.sql

YunaiV 3 years ago

parent

5d90760c39 bf37095259

commit

b845d62e8b

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
sql/ruoyi-vue-pro.sql
							 
								View File
							
				@@ -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;