超省新代驾
parent: bbf729 | 补丁 | 提交对比
puzhibing
2023-06-07 38ac3edec220a57026141ca08128518a65751c9a
refs
用户 puzhibing <393733352@qq.com>
星期三, 六月 7, 2023 18:13 +0800
提交者 puzhibing <393733352@qq.com>
星期三, 六月 7, 2023 18:13 +0800
提交38ac3edec220a57026141ca08128518a65751c9a
目录 e304c13e25cc94d72fd879b135ca405bdb25d048 目录 | zip | gz
parent bbf729e98f8b89c3c3928f472588fa8a7c54b726 查看 | 对比
05f26bd31837c3a757e388a4a9b7896ff0645ac9 查看 | 对比 
Merge remote-tracking branch 'origin/1.1' into 1.1

# Conflicts:
#	management/guns-admin/src/main/resources/redis.properties
15个文件已修改
280 ■■■■■ 已修改文件
management/guns-admin/guns-admin (1).iml 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java 62 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java 24 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgentArea.html 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html 22 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js 100 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon.js 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史