Commit Graph

627 Commits

Author SHA1 Message Date
yss
6ec8574aab Merge remote-tracking branch 'origin/dev' into dev 2021-08-31 15:31:00 +08:00
yss
d7c556b903 区块链日志 2021-08-31 15:30:49 +08:00
91b3957c44 区块链调用 2021-08-31 13:56:44 +08:00
a3c404986f 区块链调用 2021-08-31 10:39:06 +08:00
a8d60cb680 区块链调用 2021-08-31 10:38:17 +08:00
445ca2720b 区块链调用 2021-08-31 09:41:38 +08:00
6a074baeb1 区块链调用 2021-08-31 09:38:52 +08:00
30f342463e 区块链调用 2021-08-30 14:49:56 +08:00
32f84fb49d 区块链调用 2021-08-30 14:00:30 +08:00
dxc
334914dc5b 增加风险管控配置地址 2021-08-30 10:45:50 +08:00
b120b54466 Merge branch 'sim' into 'master'
Sim

See merge request eshop/biz_service_ebtp_extend!62
2021-08-27 15:51:28 +08:00
a3848fb035 Merge branch 'master-dfhz' into 'sim'
打分汇总表bug

See merge request eshop/biz_service_ebtp_extend!61
2021-08-27 11:12:02 +08:00
3716e2ca81 打分汇总表bug 2021-08-27 11:11:42 +08:00
414fe6fef8 Merge branch 'master-dfhz' into 'sim'
Master dfhz

See merge request eshop/biz_service_ebtp_extend!60
2021-08-27 11:05:25 +08:00
8f69b8edbe 打分汇总表bug 2021-08-27 11:04:38 +08:00
yss
c08fde5882 区块链日志 2021-08-26 14:03:01 +08:00
yss
551d74e59d 区块链日志 2021-08-26 13:45:59 +08:00
yss
7a5ccf2b1e 区块链日志 2021-08-26 13:35:39 +08:00
dxc
5744420b84 增加风险管控配置地址 2021-08-26 12:32:45 +08:00
dxc
5729e02ec8 Merge remote-tracking branch 'origin/uat' into uat 2021-08-26 12:25:37 +08:00
dxc
f2b1a58954 修改风险管控接口返回错误通知 2021-08-26 12:25:00 +08:00
yss
d8654ffc0b 区块链日志 2021-08-26 11:23:49 +08:00
yss
0ca825e16e Merge remote-tracking branch 'origin/dev' into dev 2021-08-26 11:00:53 +08:00
yss
51baa8b9d7 区块链日志 2021-08-26 10:54:11 +08:00
525b100dc8 Merge branch 'uat' into 'sim'
Uat

See merge request eshop/biz_service_ebtp_extend!59
2021-08-26 08:40:22 +08:00
c9c7731779 Merge branch 'uat' into 'dev'
Uat

See merge request eshop/biz_service_ebtp_extend!58
2021-08-23 15:33:37 +08:00
7d4c91c2e2 添加字体库设置 2021-08-23 15:21:44 +08:00
c94fec0246 添加字体库设置 2021-08-23 14:23:33 +08:00
a37fb36daa 修改 根据bid获取文件 2021-08-23 13:43:50 +08:00
88f319f9c5 Update Dockerfile-uat 2021-08-23 13:41:10 +08:00
537311a1f4 修改 根据bid获取文件 2021-08-23 10:19:24 +08:00
04650e714e Merge branch 'dev' into 'uat'
Dev

See merge request eshop/biz_service_ebtp_extend!57
2021-08-23 08:47:08 +08:00
071e4151fc 更改保存方式 2021-08-20 17:08:26 +08:00
ba8b916278 更改保存方式 2021-08-20 17:01:06 +08:00
e1a3a317e7 更改保存方式 2021-08-20 16:50:00 +08:00
e103e68b50 更改保存方式 2021-08-20 16:33:51 +08:00
63d5d921a4 处理base64图片编码 2021-08-20 16:11:11 +08:00
9d12a1bbae 修改图片名称 2021-08-20 16:08:26 +08:00
f6489c7062 新增专家签名导出pdf 2021-08-20 15:50:02 +08:00
dxc
2b5457676d 增加风险管控接口返回错误通知 2021-08-19 16:19:42 +08:00
dxc
18fd9953c2 增加风险管控接口 2021-08-19 14:22:11 +08:00
ee86886da9 Merge branch 'uat' into sim 2021-08-16 16:03:49 +08:00
9a53185385 Merge remote-tracking branch 'origin/uat' into uat 2021-08-16 10:10:23 +08:00
cdad36d8e6 信息详情增加业务参数 2021-08-16 10:09:57 +08:00
cbf6d02668 Merge branch 'uat' into 'sim'
Uat

See merge request eshop/biz_service_ebtp_extend!56
2021-08-16 09:50:38 +08:00
0dca6d9f01 Merge branch 'dev' into 'uat'
下载记录增加机构信息

See merge request eshop/biz_service_ebtp_extend!55
2021-08-16 09:48:42 +08:00
413c08ad5b 下载记录增加机构信息 2021-08-16 09:37:37 +08:00
2ff0204497 Merge branch 'uat' into sim 2021-08-13 13:44:48 +08:00
3e3eb3ecab Merge branch 'sim'
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java
2021-08-13 09:06:56 +08:00
ed85aa6aef 信息详情增加业务参数 2021-08-11 10:31:41 +08:00