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:
@@ -13,6 +13,7 @@
|
||||
<modules>
|
||||
<module>tashow-infra-api</module>
|
||||
<module>tashow-system-api</module>
|
||||
<module>tashow-product-api</module>
|
||||
<module>tashow-trade-api</module>
|
||||
<module>tashow-pay-api</module>
|
||||
</modules>
|
||||
|
||||
Reference in New Issue
Block a user