Commit Graph

772 Commits

Author SHA1 Message Date
af7e11f44a Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加日志

See merge request eshop/biz_service_ebtp_extend!102
2022-07-01 09:58:27 +08:00
95bfb16272 增加日志 2022-07-01 09:57:19 +08:00
ec4ffeea2f Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加日志

See merge request eshop/biz_service_ebtp_extend!101
2022-07-01 09:39:09 +08:00
48686d02c5 增加日志 2022-07-01 09:37:42 +08:00
41da5316cd Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加中信请求沃支付http方法,请求头增加参数

See merge request eshop/biz_service_ebtp_extend!100
2022-06-30 16:55:44 +08:00
eb69f461ca 增加中信请求沃支付http方法,请求头增加参数
"ClientId", "com.unicom.hq.bid"
"OperationCode", "com.unicom.fcp.uapService.registeredMembers.process"
2022-06-30 16:55:04 +08:00
ff514f59c7 Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加中信请求沃支付http方法,请求头增加参数

See merge request eshop/biz_service_ebtp_extend!99
2022-06-30 16:54:05 +08:00
0fedae763e 增加中信请求沃支付http方法,请求头增加参数
"ClientId", "com.unicom.hq.bid"
"OperationCode", "com.unicom.fcp.uapService.registeredMembers.process"
2022-06-30 16:53:04 +08:00
3e9fb877b5 Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加中信请求沃支付http方法,请求头增加参数

See merge request eshop/biz_service_ebtp_extend!98
2022-06-30 16:36:57 +08:00
ae0278d3df 增加中信请求沃支付http方法,请求头增加参数
"ClientId", "com.unicom.hq.bid"
"OperationCode", "com.unicom.fcp.uapService.registeredMembers.process"
2022-06-30 16:00:55 +08:00
84483f7738 Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加中信请求沃支付http方法,请求头增加参数

See merge request eshop/biz_service_ebtp_extend!97
2022-06-30 15:53:21 +08:00
6b21c9c0ff 增加中信请求沃支付http方法,请求头增加参数
"ClientId", "com.unicom.hq.bid"
"OperationCode", "com.unicom.fcp.uapService.registeredMembers.process"
2022-06-30 15:50:23 +08:00
c0e9ea82bc Merge branch 'uat-userinfo' into 'uat_code'
Uat userinfo

See merge request eshop/biz_service_ebtp_extend!96
2022-06-30 14:52:56 +08:00
ea84d333f4 获取用户信息添加缓存 2022-06-30 14:52:09 +08:00
56d6a333da 修改local的配置文件 2022-06-30 14:51:27 +08:00
adc0a6ef72 Revert "Revert "Merge branch 'uat-userinfo' into 'uat_code'""
This reverts commit bfbc7235c3.
2022-06-30 10:16:15 +08:00
16d0c02b3e Merge branch 'uat-userinfo' into uat_code
# Conflicts:
#	src/main/resources/application-local.yml
2022-06-30 10:15:30 +08:00
fcb9535208 修改local的配置文件 2022-06-30 10:14:33 +08:00
1449616ba9 Merge branch 'uat_保证金天擎调用' into 'uat_code'
中信支付使用的 天擎公共接口

See merge request eshop/biz_service_ebtp_extend!95
2022-06-30 10:12:48 +08:00
dfc5608113 Merge branch 'uat_保证金天擎调用' into 'uat'
中信支付使用的 天擎公共接口

See merge request eshop/biz_service_ebtp_extend!93
2022-06-30 10:11:59 +08:00
724081f717 中信支付使用的 天擎公共接口 2022-06-30 10:04:54 +08:00
b8a1e55044 Merge remote-tracking branch 'origin/uat_partyMemberEvent' into uat_partyMemberEvent 2022-06-30 10:01:50 +08:00
ba6510ad0e 党员活动 保存接口 2022-06-30 10:01:27 +08:00
952856903d Merge branch 'uat_partyMemberEvent' 2022-06-29 20:23:16 +08:00
e88a84fd68 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-29 19:32:18 +08:00
f6fa92768b 党支部数量 2022-06-29 19:32:06 +08:00
1955e54d25 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-29 18:58:25 +08:00
f83498bede 党支部数量 2022-06-29 18:58:06 +08:00
32fa4a4e52 Merge branch 'revert-4d2dfddd' into 'uat_code'
Revert "Merge branch 'uat-userinfo' into 'uat_code'"

See merge request eshop/biz_service_ebtp_extend!92
2022-06-29 17:51:59 +08:00
bfbc7235c3 Revert "Merge branch 'uat-userinfo' into 'uat_code'"
This reverts merge request !91
2022-06-29 17:51:42 +08:00
4d2dfdddbe Merge branch 'uat-userinfo' into 'uat_code'
修改获取当前用户机制

See merge request eshop/biz_service_ebtp_extend!91
2022-06-29 16:46:34 +08:00
521efd1546 修改获取当前用户机制 2022-06-29 16:43:52 +08:00
e66b28dd32 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-29 15:28:16 +08:00
cd9fc38c4c 党员活动 党支部数量 2022-06-29 15:27:45 +08:00
26057004f2 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-29 10:10:17 +08:00
d316e23941 党员活动 模拟数据过滤 2022-06-29 10:09:43 +08:00
ba5126f0e6 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 17:26:38 +08:00
cd2f321662 党员活动 活动宣言判断空 2022-06-28 17:25:05 +08:00
de4c91f627 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 16:44:13 +08:00
07b1f56ea5 党员活动 模糊查询接口改body传值 2022-06-28 16:43:43 +08:00
71bfd5f582 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 15:58:39 +08:00
e28d71f140 党员活动 模糊查询接口改body传值 2022-06-28 15:58:10 +08:00
6cbc01341e Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 14:58:30 +08:00
935f7a3689 党员活动 模糊查询接口改post 2022-06-28 14:57:38 +08:00
98f6315119 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 13:39:49 +08:00
b21af4db15 党员活动 查询参数 2022-06-28 13:38:25 +08:00
4862965bb0 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 10:47:05 +08:00
50a969ee47 党员活动 联系人排序 2022-06-28 10:46:34 +08:00
776d161836 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 10:10:18 +08:00
4add218bea 党员活动 党支部数量 2022-06-28 10:05:07 +08:00