Commit Graph

838 Commits

Author SHA1 Message Date
2a9e0fdf2f Merge branch 'master-短信加是否启用标识' into 'uat_code'
短信模板加启用标识根据标识判断是否发送短信

See merge request eshop/biz_service_ebtp_extend!3
2023-03-07 00:36:59 +00:00
yss
a14d1dd06c 短信模板加启用标识根据标识判断是否发送短信 2023-03-07 08:31:31 +08:00
7a62620c99 Merge branch 'master_区块链天擎修复' into uat_code 2023-01-17 15:26:27 +08:00
3d5998f767 修复区块链天擎拼接参数 getUniBss 使用错误 2023-01-17 15:24:14 +08:00
5606132c84 修复区块链天擎拼接参数 getUniBss 使用错误 2023-01-17 15:02:08 +08:00
93e9f64136 Merge remote-tracking branch 'origin/uat' into uat 2023-01-17 14:57:17 +08:00
cdfed958d0 修复区块链天擎拼接参数 getUniBss 使用错误 2023-01-17 14:55:56 +08:00
468e9d14bb 修复区块链天擎拼接参数 getUniBss 使用错误 2023-01-17 14:49:35 +08:00
yss
b16ffd9859 Merge branch 'master-风控中心加属性' into uat_code 2023-01-11 16:26:38 +08:00
yss
5432dec299 风控中心加风控对象属性-部门 2023-01-11 16:12:17 +08:00
yss
27c5ba10b1 风控中心加风控对象属性-部门 2023-01-11 16:11:43 +08:00
af79d66251 Merge remote-tracking branch 'origin/master' 2022-12-01 10:28:16 +08:00
21e311b2a7 Merge remote-tracking branch 'origin/uat_code' into uat_code 2022-10-10 14:28:59 +08:00
2da2e7a0e7 Merge branch 'uat_保证金天擎调用' into uat_code 2022-10-10 14:28:14 +08:00
d9631fbab8 修改 中信支付天擎接口参数实体类 2022-10-10 14:26:57 +08:00
18980a0184 Merge branch 'uat_保证金天擎调用' into uat_code 2022-10-10 14:09:06 +08:00
21ed14ba1a 修改 中信支付天擎接口参数实体类 2022-10-10 14:07:37 +08:00
8197002852 Merge branch 'uat_保证金天擎调用' into uat_code 2022-10-10 11:32:01 +08:00
38eddaa7dc 修改 中信支付天擎接口参数实体类 2022-10-10 11:30:48 +08:00
yss
8d4989c07e Merge branch 'master-风控中心加属性' into uat_code 2022-10-08 10:38:17 +08:00
yss
c096968642 风控中心加风控对象属性 2022-10-08 10:37:04 +08:00
yss
d828b6e545 Merge branch 'master-风控中心加属性' into uat_code
# Conflicts:
#	src/main/resources/application.yml
2022-09-29 14:36:20 +08:00
yss
f53e868916 Merge remote-tracking branch 'origin/master' into master-风控中心加属性 2022-09-29 14:33:45 +08:00
yss
d334ef014d 风控中心-加日志注解 2022-09-29 14:33:04 +08:00
yss
894dca1005 Merge branch 'master-风控中心加属性' into uat_code 2022-09-28 11:13:04 +08:00
yss
18554ad6c2 风控中心加风控对象属性 2022-09-27 14:26:09 +08:00
yss
28377ffa1f Merge branch 'master-风控中心加属性' into uat_code 2022-09-27 11:08:15 +08:00
yss
d15ac34e0b 风控中心加风控对象属性 2022-09-27 11:02:29 +08:00
yss
1a758ad5d9 Merge branch 'master-风控中心加属性' into uat_code 2022-09-26 11:27:12 +08:00
yss
ec1c068df4 Merge remote-tracking branch 'origin/uat_code' into uat_code 2022-09-26 11:26:01 +08:00
05bc20591b jasypt 2022-09-23 14:55:53 +00:00
d3077853e7 Merge branch 'uat-deleteuserinfo' into 'master'
uat到master

See merge request eshop/biz_service_ebtp_extend!2
2022-09-23 07:08:08 +00:00
c1f7d7c945 Merge branch 'uat-put&delete' into 'master'
put&delete

See merge request eshop/biz_service_ebtp_extend!1
2022-09-23 06:49:26 +00:00
yss
fd5f4ac726 风控中心加风控对象属性 2022-09-23 09:34:05 +08:00
fd0db1f111 jasypt 2022-09-23 09:28:29 +08:00
yss
41eeb0d31d 风控中心加风控对象属性 2022-09-23 09:06:03 +08:00
cb19f1920b 生成新消息输出日志 2022-09-15 14:03:14 +08:00
0de5667def Merge branch 'uat-deleteuserinfo' into 'uat_code'
修改pom

See merge request eshop/biz_service_ebtp_extend!125
2022-08-29 14:19:37 +08:00
963b460cae 修改pom 2022-08-29 14:18:54 +08:00
b914ab9f18 Merge branch 'uat-deleteuserinfo' into 'uat_code'
删除user相关接口

See merge request eshop/biz_service_ebtp_extend!124
2022-08-29 11:28:10 +08:00
a84ddb1f5f 删除user相关接口 2022-08-29 11:27:22 +08:00
02128075b2 Merge branch 'uat' into 'uat_code'
Uat

See merge request eshop/biz_service_ebtp_extend!123
2022-08-12 10:56:25 +08:00
97d954c2bf Merge branch 'master-时间戳' into 'uat'
申请时间戳异常 不提示

See merge request eshop/biz_service_ebtp_extend!122
2022-08-12 10:50:35 +08:00
55e2394516 Merge branch 'master' into 'uat'
Master

See merge request eshop/biz_service_ebtp_extend!121
2022-08-12 08:45:01 +08:00
e44e9ee59b Merge branch 'uat_保证金天擎调用' into 'uat'
Uat 保证金天擎调用

See merge request eshop/biz_service_ebtp_extend!120
2022-08-12 08:40:05 +08:00
d87cfa4ddb 申请时间戳异常 不提示 2022-08-04 17:20:57 +08:00
e13284ff4d Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加天擎接口https请求 ssl证书

See merge request eshop/biz_service_ebtp_extend!118
2022-08-01 17:03:26 +08:00
d46efb3b6c 增加天擎接口https请求 ssl证书 2022-08-01 15:50:35 +08:00
c069180be0 Merge branch 'uat_保证金天擎调用' into 'uat_code'
天擎接口优化

See merge request eshop/biz_service_ebtp_extend!114
2022-07-27 16:51:25 +08:00
6df457a678 天擎接口优化 2022-07-27 16:50:24 +08:00