岐济生
parent: 43d63e | 补丁 | 提交对比
puzhibing
2024-12-18 9834270f97f63dd46cb4aa845cd6b63f1c9382a7
refs
用户 puzhibing <393733352@qq.com>
星期三, 十二月 18, 2024 11:41 +0800
提交者 puzhibing <393733352@qq.com>
星期三, 十二月 18, 2024 11:41 +0800
提交9834270f97f63dd46cb4aa845cd6b63f1c9382a7
目录 4716cb294b4d7bad15951026907df3cdc5f90d3c 目录 | zip | gz
parent 43d63ea7be939e33861ad8edd001de5cb8124ac0 查看 | 对比
0513d97cf520791984329abd9c5c02e8d6a05563 查看 | 对比 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
5个文件已修改
64 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/ShopBalanceStatementMapper.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopBalanceStatementMapper.xml 27 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史