-
… into feature/multi-module Conflicts: yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/config/BpmActivitiConfiguration.java
-
2. member 模块，统一使用 member 前缀 3. 修改 Spring Security logout 配置，支持多用户类型的退出
-
…-pro into feature/flowable Conflicts: pom.xml yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/config/BpmActivitiConfiguration.java
-
Merge pull request !60 from 宋天/feature/user-register
-
Merge pull request !68 from 芋道源码/pay_extension
-
Merge pull request !67 from 芋道源码/feature/activiti