海恒-鸿瑞堂
parent: 968e37 | 补丁 | 提交对比
puzhibing
2025-07-04 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe
refs
用户 puzhibing <393733352@qq.com>
星期五, 七月 4, 2025 20:39 +0800
提交者 puzhibing <393733352@qq.com>
星期五, 七月 4, 2025 20:39 +0800
提交486e2d4a76f2dce7edff272d12d5d98aec2e8bfe
目录 4c46f5fbb4107920206eb2d914efdaea0a1233b8 目录 | zip | gz
parent 968e374ed1c2ef0595b277fc44067fb61e063a41 查看 | 对比 
Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

# Conflicts:
#	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
3个文件已修改
28 ■■■■■ 已修改文件
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java 24 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史