Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
sql/ry_20200901.sql
ÎļþÃû´Ó sql/ry_20200822.sql ÐÞ¸Ä |
| | |
| | | notice_id int(4) not null auto_increment comment 'å
ŒID', |
| | | notice_title varchar(50) not null comment 'å
¬åæ é¢', |
| | | notice_type char(1) not null comment 'å
¬åç±»åï¼1éç¥ 2å
¬åï¼', |
| | | notice_content blob default null comment 'å
¬åå
容', |
| | | notice_content longblob default null comment 'å
¬åå
容', |
| | | status char(1) default '0' comment 'å
¬åç¶æï¼0æ£å¸¸ 1å
³éï¼', |
| | | create_by varchar(64) default '' comment 'å建è
', |
| | | create_time datetime comment 'å建æ¶é´', |