Commit Graph

6 Commits

Author SHA1 Message Date
baozhuhui
f2244a3a07 Merge branch 'master' of https://gitee.com/tearn/JSH_ERP
# Conflicts:
#	src/main/java/com/jsh/erp/service/app/AppService.java
#	src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java
2019-04-01 21:46:48 +08:00
baozhuhui
ff28be7173 baozh:修改角色功能权限的同时,同步应用权限。 2019-04-01 21:17:17 +08:00
qiankunpingtai
1f2cf8c313 全局修改物理删除为逻辑删除,同时修改查询语句过滤删除标识 2019-04-01 17:07:13 +08:00
cjl
8c71714538 修改几个不带样式的弹框提示 2019-02-18 15:43:50 +08:00
季圣华
b163bc1d4a 解决权限bug 2018-12-23 21:53:22 +08:00
季圣华
91a6b722b9 更新前端 2018-12-19 23:51:59 +08:00