java/HongRuiTang.git

海恒-鸿瑞堂

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

2025-06-30 25d47cb937792b48690d5ccdd8aa06b202cd0967

refs
用户	puzhibing <393733352@qq.com>
	星期一, 六月 30, 2025 14:35 +0800
提交者	puzhibing <393733352@qq.com>
	星期一, 六月 30, 2025 14:35 +0800
提交	25d47cb937792b48690d5ccdd8aa06b202cd0967
目录	9120e60af62c705e59bb94c29a137e6bc9ae7a45 目录 \| zip \| gz
parent	3dddd301e97c263dda6326c89fa11176d5960b04 查看 \| 对比

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

# Conflicts:
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java

4个文件已修改

	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/TShopAppointableTime.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopAppointableTimeServiceImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAppointableTimeMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史