Commits · ad06eddd6743fbf1d2c626c9afb17ee477b7b34c · 董敬伟 / liquidnet-bus-v1

19 Aug, 2022 16 commits
- Merge remote-tracking branch 'origin/master' into ajb_dev_xuper_transfer · ad06eddd
  张国柄 authored Aug 19, 2022
  
  ad06eddd
- ~api:生成我的藏品更新藏品订单（关联藏品ID）; · 62dc502a
  张国柄 authored Aug 19, 2022
  
  62dc502a
- ~api; · d671ed8f
  张国柄 authored Aug 19, 2022
  
  d671ed8f
- +api:商城用户安全设置+是否设置安全密码; · be316f8b
  张国柄 authored Aug 19, 2022
  
  be316f8b
- ~opt; · 1de05051
  张国柄 authored Aug 19, 2022
  
  1de05051
- Merge branch 'pre' into 'master' · 63c66cdd
  张禹 authored Aug 19, 2022
```
Pre

See merge request !297
```
  63c66cdd
- Merge branch 'zfx-Recommend' into pre · 2f507d5b
  zhengfuxin authored Aug 19, 2022
  
  2f507d5b
- Merge remote-tracking branch 'remotes/origin/master' into zfx-Recommend · 5971dda3
  zhengfuxin authored Aug 19, 2022
  
  5971dda3
- 功能阻塞5 · 8762589c
  sangchunxi authored Aug 19, 2022
  
  8762589c
- 功能阻塞3 · 4ffe17b5
  sangchunxi authored Aug 19, 2022
  
  4ffe17b5
- ~api:我的藏品详情+转赠允许时间; · 01d44975
  张国柄 authored Aug 19, 2022
  
  01d44975
- ~api:我的藏品列表+转赠允许时间; · 91b79522
  张国柄 authored Aug 19, 2022
  
  91b79522
- ~api:我的藏品列表+区块链路由、数据链交易时间; · 3ea6c363
  张国柄 authored Aug 19, 2022
  
  3ea6c363
- 功能阻塞3 · 1b295c35
  sangchunxi authored Aug 19, 2022
  
  1b295c35
- Merge remote-tracking branch 'origin/ajb_dev_xuper_transfer' into ajb_dev_xuper_transfer · a002fc88
  张国柄 authored Aug 19, 2022
  
  a002fc88
- ~api:来源为转赠的藏品转赠成功redis缓存设置过期删除处理; · 8e94ce8b
  张国柄 authored Aug 19, 2022
  
  8e94ce8b
18 Aug, 2022 24 commits
- 功能阻塞3 · 5d037bcc
  sangchunxi authored Aug 18, 2022
  
  5d037bcc
- 实现百度链nft转让功能 · 00f4e974
  anjiabin authored Aug 18, 2022
  
  00f4e974
- Merge remote-tracking branch 'origin/ajb_dev_xuper_transfer' into ajb_dev_xuper_transfer · 271945c4
  张国柄 authored Aug 18, 2022
  
  271945c4
- ~api:NFT订单详情+转赠信息; · fee92a7e
  张国柄 authored Aug 18, 2022
  
  fee92a7e
- 增加使用ar激活码量 · 220fcf12
  胡佳晨 authored Aug 18, 2022
  
  220fcf12
- Merge branch 'master' into pre · 96e85b5f
  胡佳晨 authored Aug 18, 2022
  
  96e85b5f
- 实现百度链nft转让功能 · da78000a
  anjiabin authored Aug 18, 2022
  
  da78000a
- ~api:生成藏品重复代码处理; · 227dd64d
  张国柄 authored Aug 18, 2022
  
  227dd64d
- Merge branch 'master_zhouhuan' into 'master' · ce21c900
  张禹 authored Aug 18, 2022
```
增加使用ar激活码 量

See merge request !296
```
  ce21c900
- ~api:受赠人描述; · 97e903d6
  张国柄 authored Aug 18, 2022
  
  97e903d6
- ~api:藏品转赠+updatedAt; · 6fc07f1b
  张国柄 authored Aug 18, 2022
  
  6fc07f1b
- Merge branch 'zfx-Recommend' into pre · 7f99ba97
  zhengfuxin authored Aug 18, 2022
  
  7f99ba97
- ~api:藏品ID列表缓存降级调整; · 8ba21aef
  张国柄 authored Aug 18, 2022
  
  8ba21aef
- 修改新增时候的一个效验 · bafbe583
  zhengfuxin authored Aug 18, 2022
  
  bafbe583
- 增加使用ar激活码量 · b01caaf9
  胡佳晨 authored Aug 18, 2022
  
  b01caaf9
- Merge remote-tracking branch 'origin/pre' into pre · 36d903a0
  胡佳晨 authored Aug 18, 2022
  
  36d903a0
- 增加使用ar激活码量 · cdcfddcb
  胡佳晨 authored Aug 18, 2022
  
  cdcfddcb
- Merge branch 'zfx-Recommend' into pre · 2848c003
  zhengfuxin authored Aug 18, 2022
  
  2848c003
- ~api:藏品详情; · 6670f2f0
  张国柄 authored Aug 18, 2022
  
  6670f2f0
- ~api:藏品详情; · 7169911d
  张国柄 authored Aug 18, 2022
  
  7169911d
- ~api:藏品转赠结果查询队列处理; · 64864fc4
  张国柄 authored Aug 18, 2022
  
  64864fc4
- ~api:藏品详情调整; · 136cbc02
  张国柄 authored Aug 18, 2022
  
  136cbc02
- ~api:藏品转赠结果查询队列及处理; · 7e8fedd6
  张国柄 authored Aug 18, 2022
  
  7e8fedd6
- 功能阻塞2 · a37a28cf
  sangchunxi authored Aug 18, 2022
  
  a37a28cf