无关风月
2024-07-17 1632742d621bba914f98d2c7d62a9565145cac02
refs
用户 无关风月 <443237572@qq.com>
星期三, 七月 17, 2024 11:18 +0800
提交者 无关风月 <443237572@qq.com>
星期三, 七月 17, 2024 11:18 +0800
提交1632742d621bba914f98d2c7d62a9565145cac02
目录 e47d96cb9e000033240d9782953302bc53b8d6c4 目录 | zip | gz
parent 42a10a0fa0f8c6717ec0bea83ce4670d8a9c1346 查看 | 对比
527810c22eb91969667b5e37649d12306653db15 查看 | 对比
Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

# Conflicts:
# ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
# ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
2个文件已添加
13个文件已修改
347 ■■■■■ 已修改文件
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java 24 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml 31 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java 18 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java 9 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/resources/application-test.yml 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html 3 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/userRedRecord.html 61 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/userRedRecord.js 147 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史