-
…-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
-
Conflicts: sql/ruoyi-vue-pro.sql yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysDictTypeConstants.java yudao-admin-server/src/main/resources/application-local.yaml yudao-admin-server/src/main/resources/application.yaml yudao-admin-server/src/test/resources/sql/clean.sql yudao-admin-server/src/test/resources/sql/create_tables.sql yudao-admin-ui/src/utils/dict.js
-
Merge pull request !66 from 芋道源码/pay_extension
-
Merge pull request !65 from 芋道源码/feature/activiti