spring-cloud/yudao-module-mall/yudao-module-product-biz
YunaiV 7c3dacc875 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
2024-12-27 22:19:54 +08:00
..
src Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-12-27 22:19:54 +08:00
Dockerfile Update Dockerfile base image to 8-jre 2023-12-30 11:28:19 +08:00
pom.xml 【代码优化】MALL:移除 bootstrap.yaml,和 boot 保持一致 2024-07-14 19:16:12 +08:00