154 Commits (e9f9fc4b92a055e4a42b015a836f3df78b1f6dd0)

Author	SHA1	Message	Date
kuangbx	ebe67e7bde	Merge remote-tracking branch 'origin/master' ... # Conflicts: # ruoyi-admin/pom.xml # ruoyi-framework/pom.xml	2018-10-07 22:29:19 +08:00
kuangbx	211a0ab746	[修改内容]调整Pom依赖，目前ruoyi-admin只依赖ruoyi-framework,ruoyi-framework依赖ruoyi-system，ruoyi-generator,ruoyi-quartz。ruoyi-common为基础模块。 ... [修改人]匡宝旭 [修改时间]2018-10-07 22:06 [备注]编译，打包，测试均通过	2018-10-07 22:06:58 +08:00
RuoYi	2f0c5d2b03	若依 3.0	2018-10-07 21:36:22 +08:00
RuoYi	e166127c9f	若依 3.0	2018-10-07 14:16:47 +08:00