java/qijisheng.git

岐济生

Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-13 e734816f2da83f4d0f58d9d09cef45a3a658a466

refs
用户	luodangjia <luodangjia>
	星期一, 一月 13, 2025 17:12 +0800
提交者	luodangjia <luodangjia>
	星期一, 一月 13, 2025 17:12 +0800
提交	e734816f2da83f4d0f58d9d09cef45a3a658a466
目录	44a2ba2c466af39b25d5765840c16a5889b45c2d 目录 \| zip \| gz
parent	976a372f42b438edd8465a66e084b36deef38500 查看 \| 对比 955b0ea6a5219997345fc9812319ed961302cd88 查看 \| 对比

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/GoodsClientFallbackFactory.java
#	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GoodsClient.java
#	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java

8个文件已修改

	ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/CouponInfoVo.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/GoodsClientFallbackFactory.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GoodsClient.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史