java/SuperSaveDriving.git

Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-24 b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1

refs
用户	puzhibing <393733352@qq.com>
	星期五, 二月 24, 2023 10:06 +0800
提交者	puzhibing <393733352@qq.com>
	星期五, 二月 24, 2023 10:06 +0800
提交	b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1
目录	2185d4026813cabf7fa66d6653ebcbcf3c9341f1 目录 \| zip \| gz
parent	1f0899504f54bae20c19122b4fde82523235233b 查看 \| 对比 39c58fe1a0469b99bd5ef0a24f6b254693826a18 查看 \| 对比

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
#	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
#	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

28个文件已修改

13个文件已添加

	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/pom.xml	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/config/WxConfig.java	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java	34 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java	155 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/AccessTokenRespBody.java	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/RespBody.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TAppUserResp.java	54 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java	49 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/Constant.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/HttpUtils.java	295 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/TokenUtils.java	53 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UUIDUtil.java	99 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WxJsonUtils.java	109 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderRefusalMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAppUserServiceImpl.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java	163 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/resources/application.yml	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent_add.html	115 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetail.html	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserDetailException.html	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverArea.html	57 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAudit.html	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverCommission.html	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html	26 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html	165 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html	141 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js	104 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverCommission.js	227 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	management/guns-admin/src/main/webapp/static/modular/system/tDriver/tOrderRefusal.js	101 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史