Commit Graph

8 Commits

Author SHA1 Message Date
daiao 911a769670 Merge branch 'develop' into dev_shcool
Conflicts:
	app/models/applied_message.rb
2016-07-29 22:05:56 +08:00
daiao d6178ec7dd 管理员界面单位申请 2016-07-29 21:45:52 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
2016-07-29 20:52:18 +08:00
huang 643b06484b 消息表添加字段 2016-07-29 20:50:55 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
daiao 50ec127c5b 单位名称列表功能 2016-07-28 20:01:22 +08:00
huang 2f79e521ca 单位批准发送消息;申请单位给系统每位管理员发送消息 2016-07-27 11:20:12 +08:00
daiao 9e788c9b6f 单位批准及消息框架搭建 2016-07-27 10:46:48 +08:00