Commit Graph

485 Commits

Author SHA1 Message Date
05f203b56f Merge branch 'uat' into 'master'
20220422发版

See merge request eshop/biz_service_ebtp_extend!82
2022-04-22 17:27:05 +08:00
82ba5c1568 Merge branch 'master' into 'uat'
# Conflicts:
#   src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java
2022-04-22 17:26:52 +08:00
70c55da8c0 修改区块链日志,使用mongdb存储,只记录错误日志 2022-04-22 17:22:14 +08:00
c42b9b8178 修改区块链日志,使用mongdb存储,只记录错误日志 2022-04-22 17:12:08 +08:00
a6a77438ea 修改区块链日志,使用mongdb存储,只记录错误日志 2022-04-22 17:04:17 +08:00
22c7de9b47 修改区块链日志,使用mongdb存储,只记录错误日志 2022-04-22 16:51:33 +08:00
044a876440 修改区块链日志,使用mongdb存储,只记录错误日志 2022-04-22 16:23:07 +08:00
fe0365cce6 查询query_type 2022-04-18 11:01:56 +08:00
76f9f448c6 20220315-bugs 2022-04-13 10:35:03 +08:00
90710da445 首页信息查询接口 增加根据类型查询条件 2022-04-06 16:06:28 +08:00
8b1063e2a4 首页信息查询接口 增加根据类型查询条件 2022-04-02 14:45:48 +08:00
f6f4aae302 首页信息查询接口 增加根据类型查询条件 2022-04-02 14:36:28 +08:00
470a6e7411 首页信息查询接口 增加根据类型查询条件 2022-04-02 14:33:53 +08:00
d601510083 首页信息查询接口 增加根据类型查询条件 2022-04-02 14:27:01 +08:00
ba45170b47 Merge branch 'sim' into 'master'
Sim

See merge request eshop/biz_service_ebtp_extend!81
2022-04-01 13:51:41 +08:00
d66c21740b 提交 2022-04-01 13:50:04 +08:00
14af5686ee Merge remote-tracking branch 'remotes/origin/uat-v2' into sim
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/feign/config/FeignConfiguration.java
2022-04-01 13:49:31 +08:00
539711d13a 提交 2022-04-01 10:53:49 +08:00
13584a8a83 Merge remote-tracking branch 'remotes/origin/uat' into sim 2022-04-01 09:56:00 +08:00
c6414bcaaf 删除自己feign配置 2022-04-01 09:54:52 +08:00
f671c819df Merge branch 'uat' into 'sim'
Uat

See merge request eshop/biz_service_ebtp_extend!80
2022-04-01 09:37:15 +08:00
28df6856b8 Merge branch 'master-bugs' into 'master'
20220315-bugs

See merge request eshop/biz_service_ebtp_extend!79
2022-03-22 16:13:37 +08:00
c48cdc5b02 20220315-bugs 2022-03-22 16:11:28 +08:00
c0c32553a6 Merge branch 'uat' into 'master'
阻断代码合并

See merge request eshop/biz_service_ebtp_extend!78
2022-03-22 11:47:44 +08:00
b7a3edbae2 阻断修复 2022-03-22 11:34:36 +08:00
aca166eb19 Merge branch 'master-bugs' into 'uat'
20220315-bugs

See merge request eshop/biz_service_ebtp_extend!77
2022-03-21 16:43:37 +08:00
c4aa1cec28 Merge branch 'master-bugs' into 'master'
20220315-bugs

See merge request eshop/biz_service_ebtp_extend!76
2022-03-21 16:43:11 +08:00
06d2b32c77 20220315-bugs 2022-03-21 16:15:51 +08:00
b5d302ccb2 v2.1.1 2022-03-21 09:27:21 +08:00
4b741561f4 Merge branch 'master' into 'uat'
Master

See merge request eshop/biz_service_ebtp_extend!75
2022-03-17 09:43:36 +08:00
346ec02cb0 Resources should be closed 2022-03-17 09:41:33 +08:00
6c7bcfdca5 v2.1.0 2022-03-01 10:24:28 +08:00
468a14087a Merge branch 'uat' into 'master'
20220226发版

See merge request eshop/biz_service_ebtp_extend!74
2022-02-26 11:17:36 +08:00
2a4eff8663 删除信息接口 2022-01-26 16:09:33 +08:00
94f4867066 删除信息接口 2022-01-26 16:07:49 +08:00
90bc659d89 删除信息接口 2022-01-26 15:54:21 +08:00
b61746dda7 删除信息接口 2022-01-26 14:52:13 +08:00
e0cc235371 删除信息接口 2022-01-26 14:36:56 +08:00
153ce05189 删除信息接口 2022-01-26 09:30:05 +08:00
48d80c9821 删除信息接口 2022-01-26 09:20:32 +08:00
2b5e068254 删除信息,如果没有返回成功 2022-01-25 17:24:53 +08:00
1f65e9b652 区块链迁移 2022-01-25 09:29:50 +08:00
942ba6f4ef 天擎接口调试 2022-01-25 09:10:43 +08:00
6240498f9e 天擎接口调试 2022-01-25 09:08:11 +08:00
4cb07d68ce 天擎接口调试 2022-01-24 18:27:58 +08:00
b192da6e12 天擎接口调试 2022-01-24 18:09:33 +08:00
b3405087f3 天擎接口调试 2022-01-24 18:02:24 +08:00
91ef37e7fb 天擎接口调试 2022-01-24 17:27:27 +08:00
49fdb92659 天擎接口调试 2022-01-24 17:14:01 +08:00
d9ca753151 区块链加密 从脚手架迁移到扩展服务 2022-01-24 17:04:36 +08:00