java/QianYunTong.git

黔云通

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

2025-08-05 d7073ba542fa70a4882c44a7484753deaa4fd7e5

refs
用户	liujie <1793218484@qq.com>
	星期二, 八月 5, 2025 14:00 +0800
提交者	liujie <1793218484@qq.com>
	星期二, 八月 5, 2025 14:00 +0800
提交	d7073ba542fa70a4882c44a7484753deaa4fd7e5
目录	19408138eb7cbf0a14bdf27dae6329233f05337d 目录 \| zip \| gz
parent	5367f2172a955113068d6c97cde0b78c6c85fdf8 查看 \| 对比 133e28475098b607208333846b46b85cd0e09a4a 查看 \| 对比

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

# Conflicts:
#	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java
#	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java

2个文件已删除

20个文件已修改

1 文件已重命名

1个文件已添加

	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java	34 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianUtil.java	93 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/model/ZLUserInfo.java	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java	95 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/util/Util.java	103 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/tencent/common/HttpsRequest.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/tencent/common/HttpsRequest_2.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/tencent/common/Signature.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/tencent/common/Util.java	127 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/tencent/common/XMLParser.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/tencent/protocol/AppPayReqData.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/util/ApiUtil.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/util/DateUtil.java	1102 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/util/OrdersUtil.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java	55 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java	1085 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史