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

..

common

增加页面过滤器，提高系统安全性

2019-03-03 13:28:21 +08:00

financial

增加单据打印的功能

2019-03-03 23:50:54 +08:00

manage

Merge branch 'master' of https://gitee.com/tearn/JSH_ERP

2019-04-01 21:46:48 +08:00

materials

!41 全局修改物理删除为逻辑删除，同时修改查询语句过滤删除标识

2019-04-01 21:05:18 +08:00

reports

优化对账报表的页面显示

2019-03-09 18:24:17 +08:00

user

修改未加样式的提示

2019-02-22 11:19:09 +08:00