Merge remote-tracking branch 'origin/xlj' into feature/order
# Conflicts: # tashow-feign/pom.xml # tashow-module/pom.xml # tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/controller.vm # tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/listReqVO.vm # tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/pageReqVO.vm # tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/respVO.vm # tashow-module/tashow-module-infra/src/main/resources/codegen/java/controller/vo/saveReqVO.vm # tashow-module/tashow-module-system/src/main/resources/application-local.yaml
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
<module>tashow-module-system</module>
|
||||
<module>tashow-module-infra</module>
|
||||
<module>tashow-module-app</module>
|
||||
<module>tashow-module-product</module>
|
||||
<module>tashow-module-pay</module>
|
||||
<module>tashow-module-trade</module>
|
||||
</modules>
|
||||
|
||||
Reference in New Issue
Block a user