Commits · 4798897fff4882b5308996c31b12076a8dae25bd · 董敬伟 / liquidnet-bus-v1

20 Apr, 2022 9 commits
- ~config:opt; · 4798897f
  张国柄 authored Apr 20, 2022
  
  4798897f
- ~config:opt; · 65ce5912
  张国柄 authored Apr 20, 2022
  
  65ce5912
- ~config:opt; · 4a8ebf41
  张国柄 authored Apr 20, 2022
  
  4a8ebf41
- ~config:opt; · 3fc38067
  张国柄 authored Apr 20, 2022
  
  3fc38067
- ~config:opt; · 786d478f
  张国柄 authored Apr 20, 2022
  
  786d478f
- ~config:opt; · 1373af49
  张国柄 authored Apr 20, 2022
  
  1373af49
- ~config:opt; · d1d5e210
  张国柄 authored Apr 20, 2022
  
  d1d5e210
- ~config:opt; · 5b1b76fa
  张国柄 authored Apr 20, 2022
  
  5b1b76fa
- 更新购买逻辑修复购买失败记录 · 62fefc75
  anjiabin authored Apr 20, 2022
  
  62fefc75
19 Apr, 2022 5 commits
- 修改nft订单查询 · 0b831df9
  anjiabin authored Apr 19, 2022
  
  0b831df9
- 修改nft订单查询 · ebc67c35
  anjiabin authored Apr 19, 2022
  
  ebc67c35
- 修改nft订单查询 · 49ea614f
  anjiabin authored Apr 19, 2022
  
  49ea614f
- ~opt:chain; · 2cce1c38
  张国柄 authored Apr 19, 2022
  
  2cce1c38
- ~api:开启盲盒+返回值artworkId; · 15351a26
  张国柄 authored Apr 19, 2022
  
  15351a26
18 Apr, 2022 26 commits
- Merge branch 'pre' into 'master' · 9dbabd5d
  Administrator authored Apr 18, 2022
```
Pre

See merge request !212
```
  9dbabd5d
- Merge branch 'hjc_sweet_video' into pre · a13733ef
  胡佳晨 authored Apr 18, 2022
  
  a13733ef
- 添加方法设置/获取 ios 的支付方式 · 1605bc86
  胡佳晨 authored Apr 18, 2022
  
  1605bc86
- 添加方法设置/获取 ios 的支付方式 · b7f32064
  胡佳晨 authored Apr 18, 2022
  
  b7f32064
- ~Mdb.update.LocalDateTime:更正mongoTemplate.getCollection(...).updteOne/upateMan... · e23becc2
  张国柄 authored Apr 18, 2022
```
~Mdb.update.LocalDateTime:更正mongoTemplate.getCollection(...).updteOne/upateMany中使用Update.update(...)更新时间`LocalDateTime`时区错误，以上情况统一使用Converter转换`LocalDateTime`处理;
```
  e23becc2
- 苹果支付。 · d15d4f4e
  zhengfuxin authored Apr 18, 2022
  
  d15d4f4e
- Merge remote-tracking branch 'origin/jxl_nft_per' into jxl_nft_per · 282afe4d
  jiangxiulong authored Apr 18, 2022
  
  282afe4d
- getStatus+格式化 · 87aa6444
  jiangxiulong authored Apr 18, 2022
  
  87aa6444
- ~ · 803aa092
  张国柄 authored Apr 18, 2022
  
  803aa092
- exit 修改头像保存逻辑，和sku和uid查询是否预约逻辑 · 02a4a9b5
  GaoHu authored Apr 18, 2022
  
  02a4a9b5
- 盲盒不判断是否上链 · c485fc68
  jiangxiulong authored Apr 18, 2022
  
  c485fc68
- 盲盒不判断是否上链 · 1116e832
  jiangxiulong authored Apr 18, 2022
  
  1116e832
- Merge remote-tracking branch 'origin/jxl_nft_per' into jxl_nft_per · abff0c44
  jiangxiulong authored Apr 18, 2022
  
  abff0c44
- 盲盒不判断是否上链 · e43c1097
  jiangxiulong authored Apr 18, 2022
  
  e43c1097
- ~Mdb.update.LocalDateTime:更正mongoTemplate.getCollection(...).updteOne/upateMan... · 2cc1b8ae
  张国柄 authored Apr 18, 2022
```
~Mdb.update.LocalDateTime:更正mongoTemplate.getCollection(...).updteOne/upateMany中使用Update.update(...)更新时间`LocalDateTime`时区错误，以上情况统一使用Converter转换`LocalDateTime`处理;
```
  2cc1b8ae
- Merge remote-tracking branch 'origin/jxl_nft_per' into jxl_nft_per · 0a26b83e
  jiangxiulong authored Apr 18, 2022
  
  0a26b83e
- 和goblin统一判断概率 · dee18d62
  jiangxiulong authored Apr 18, 2022
  
  dee18d62
- exit 预约人数储存修改 · 003682ad
  GaoHu authored Apr 18, 2022
  
  003682ad
- Merge remote-tracking branch 'origin/jxl_nft_per' into jxl_nft_per · 2c06a66d
  jiangxiulong authored Apr 18, 2022
  
  2c06a66d
- 设置了不能购买的sku也不计算库存 · 1a820dcc
  jiangxiulong authored Apr 18, 2022
  
  1a820dcc
- sweet-修改创建修改艺人，图片/视频数组必填的bug · 9c1b55ea
  胡佳晨 authored Apr 18, 2022
  
  9c1b55ea
- Merge branch 'jxl_nft_per' of... · cf243c2d
  anjiabin authored Apr 18, 2022
```
Merge branch 'jxl_nft_per' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into jxl_nft_per
```
  cf243c2d
- 修改galaxy购买消费相关 · 00f1d3e8
  anjiabin authored Apr 18, 2022
  
  00f1d3e8
- 日志增加记录字段 · fd6b684d
  jiangxiulong authored Apr 18, 2022
  
  fd6b684d
- Merge remote-tracking branch 'origin/pre_galaxy_0420' into jxl_nft_per · e133425f
  anjiabin authored Apr 18, 2022
  
  e133425f
- NFT上传声明状态|1-已声明才展示 · e2a53e65
  jiangxiulong authored Apr 18, 2022
  
  e2a53e65