-
# Conflicts: # pom.xml # yudao-server/pom.xml # yudao-server/src/main/resources/application-local.yaml # yudao-server/src/main/resources/application.yaml
-
Merge pull request !1097 from puhui999/develop
-
Merge pull request !978 from 芋道源码/feature/bpm
-
# Conflicts: # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
-
① CrmPermissionUtils 解决分页过滤 ② CrmPermissionAspect 解决查询详情过滤
