-
# Conflicts: # yudao-ui-admin/src/views/mall/product/spu/index.vue
-
2. 完整移除 activiti 遗留的东东
-
Merge pull request !239 from lanyue52011/feature/visual
-
Merge pull request !240 from gordon_xie/feature/alipay-pc
# Conflicts: # yudao-ui-admin/src/views/mall/product/spu/index.vue
2. 完整移除 activiti 遗留的东东
Merge pull request !239 from lanyue52011/feature/visual
Merge pull request !240 from gordon_xie/feature/alipay-pc