Commit Graph

860 Commits

Author SHA1 Message Date
f021186be4 Merge branch 'uat_partyMemberEvent' into uat 2022-07-08 21:20:41 +08:00
2488255859 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-08 16:13:16 +08:00
cadd2785ac 提意见增加公司名 2022-07-08 16:12:45 +08:00
5c5fba8713 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-07 14:30:36 +08:00
ad82983e67 党员活动 所属党支部 2022-07-07 14:30:12 +08:00
cef9a78d05 Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加日志

See merge request eshop/biz_service_ebtp_extend!109
2022-07-07 14:12:38 +08:00
4700c8e9e9 增加日志 2022-07-07 14:11:28 +08:00
f3b35c2ad8 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-07 08:44:58 +08:00
f3fe12a8ea 党员活动 文档中心获取地址 2022-07-07 08:44:33 +08:00
14882423cc Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 17:06:58 +08:00
cc69c73b78 党员活动 文档中心获取地址 2022-07-06 17:06:34 +08:00
130c851ff9 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 16:46:37 +08:00
2f58710bce 党员活动 文档中心获取地址 2022-07-06 16:46:13 +08:00
c1516d30f2 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 16:39:54 +08:00
750abad4c8 党员活动 文档中心获取地址 2022-07-06 16:39:35 +08:00
56e7da9a8d Merge branch 'uat_partyMemberEvent' into uat_code
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java
2022-07-06 16:22:17 +08:00
65d77640b5 党员活动 文档中心获取地址 2022-07-06 16:21:24 +08:00
c4a4e77a74 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 15:47:11 +08:00
1fa9dbb7cf 党员活动 根据党支部名称查询 2022-07-06 15:46:51 +08:00
2b9324210c 党员活动 根据党支部名称查询 2022-07-06 14:40:06 +08:00
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