From c966d9bada8e189f0beb4867fce81ae73f3fcebd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 02 八月 2020 18:31:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 sql/ry_20200724.sql |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sql/ry_20200629.sql b/sql/ry_20200724.sql
similarity index 99%
rename from sql/ry_20200629.sql
rename to sql/ry_20200724.sql
index 3af5000..65a3065 100644
--- a/sql/ry_20200629.sql
+++ b/sql/ry_20200724.sql
@@ -120,7 +120,7 @@
 -- ----------------------------
 -- 鍒濆鍖�-瑙掕壊淇℃伅琛ㄦ暟鎹�
 -- ----------------------------
-insert into sys_role values('1', '绯荤粺绠$悊鍛�',  'admin',  1, 1, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '绯荤粺绠$悊鍛�');
+insert into sys_role values('1', '瓒呯骇绠$悊鍛�',  'admin',  1, 1, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '瓒呯骇绠$悊鍛�');
 insert into sys_role values('2', '鏅�氳鑹�',    'common', 2, 2, '0', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '鏅�氳鑹�');
 
 
@@ -635,6 +635,8 @@
   business_name     varchar(30)                                comment '鐢熸垚涓氬姟鍚�',
   function_name     varchar(50)                                comment '鐢熸垚鍔熻兘鍚�',
   function_author   varchar(50)                                comment '鐢熸垚鍔熻兘浣滆��',
+  gen_type          char(1)         default '0'                comment '鐢熸垚浠g爜鏂瑰紡锛�0zip鍘嬬缉鍖� 1鑷畾涔夎矾寰勶級',
+  gen_path          varchar(200)    default '/'                comment '鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級',
   options           varchar(1000)                              comment '鍏跺畠鐢熸垚閫夐」',
   create_by         varchar(64)     default ''                 comment '鍒涘缓鑰�',
   create_time 	    datetime                                   comment '鍒涘缓鏃堕棿',

--
Gitblit v1.9.3