|
|
6fd3805568
|
Merge branch 'uat_partyMemberEvent' into uat_code
|
2022-07-06 14:29:10 +08:00 |
|
|
|
ce49b21258
|
党员活动
|
2022-07-06 14:28:49 +08:00 |
|
|
|
1453d2fb54
|
Merge branch 'uat_partyMemberEvent' into uat_code
|
2022-07-06 14:13:32 +08:00 |
|
|
|
8d379f6a0f
|
党员活动
|
2022-07-06 14:11:50 +08:00 |
|
|
|
102026a99b
|
Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加日志
See merge request eshop/biz_service_ebtp_extend!108
|
2022-07-05 08:52:58 +08:00 |
|
|
|
ae0319e548
|
增加日志
|
2022-07-05 08:51:30 +08:00 |
|
|
|
f6147e5362
|
Merge branch 'uat_partyMemberEvent'
|
2022-07-01 17:02:46 +08:00 |
|
|
|
3b107e4c68
|
Merge remote-tracking branch 'origin/uat' into uat
|
2022-07-01 17:01:17 +08:00 |
|
|
|
1d9c6c7b92
|
党员活动 排序
|
2022-07-01 16:08:51 +08:00 |
|
|
|
c90e0e9889
|
Merge branch 'uat-userinfo' into 'master'
Uat userinfo
See merge request eshop/biz_service_ebtp_extend!107
|
2022-07-01 16:05:24 +08:00 |
|
|
|
9c2a94916b
|
Merge branch 'uat-userinfo' into 'uat'
Uat userinfo
See merge request eshop/biz_service_ebtp_extend!106
|
2022-07-01 16:04:14 +08:00 |
|
|
|
9970939b62
|
Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加日志
See merge request eshop/biz_service_ebtp_extend!105
|
2022-07-01 10:49:15 +08:00 |
|
|
|
f59d8f444c
|
增加日志
|
2022-07-01 10:47:53 +08:00 |
|
|
|
056fabe1bd
|
Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加日志
See merge request eshop/biz_service_ebtp_extend!104
|
2022-07-01 10:34:09 +08:00 |
|
|
|
ac6431f328
|
增加日志
|
2022-07-01 10:33:29 +08:00 |
|
|
|
b90dbb5c97
|
Merge branch 'uat_保证金天擎调用' into 'uat_code'
Uat 保证金天擎调用
See merge request eshop/biz_service_ebtp_extend!103
|
2022-07-01 10:17:37 +08:00 |
|
|
|
3a59fd665d
|
增加日志
|
2022-07-01 10:10:41 +08:00 |
|
|
|
c28320e4ea
|
增加日志
|
2022-07-01 10:10:07 +08:00 |
|
|
|
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 |
|
