igo出行
parent: 4a1fb1 | 补丁 | 提交对比
puzhibing
2024-01-31 2a0298bb6ce4584ba311d7eba8454f515d2b0b3c
refs
用户 puzhibing <393733352@qq.com>
星期三, 一月 31, 2024 15:42 +0800
提交者 puzhibing <393733352@qq.com>
星期三, 一月 31, 2024 15:42 +0800
提交2a0298bb6ce4584ba311d7eba8454f515d2b0b3c
目录 2d25e39dd697c68e38b25e9367bce55eaae58dc9 目录 | zip | gz
parent 4a1fb1968c9c7a22938b2e1c5edc920adf8e3034 查看 | 对比
d06bbceccd3469a0aedce0ed6276916f44e2b194 查看 | 对比 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ManagementIGOTravel/guns-admin/src/main/resources/application.yml
24个文件已修改
254 ■■■■■ 已修改文件
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java 33 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarService.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java 48 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/resources/application-produce.yml 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html 18 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html 20 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史