Commits · fea9fa1daa96bb32d4fc1979e4fa6eabb4a9a60e · 董敬伟 / liquidnet-bus-v1 · GitLab

记得上下班打卡 | git大法好，push需谨慎

27 May, 2022 14 commits
- view · fea9fa1d
  jiangxiulong authored May 27, 2022
  
  fea9fa1d
- admin nft列表：增加手机号搜索；增加藏品类型 · 3c5b7b8f
  jiangxiulong authored May 27, 2022
  
  3c5b7b8f
- view · e0e1e601
  jiangxiulong authored May 27, 2022
  
  e0e1e601
- admin nft列表：优化搜索优化sql 增加展示是否是盲盒兑换展示兑换码 · 2218316f
  jiangxiulong authored May 27, 2022
  
  2218316f
- admin nft列表恢复 · 00db674e
  jiangxiulong authored May 27, 2022
  
  00db674e
- Merge remote-tracking branch 'origin/hjc_goblin_list_unbox' into hjc_goblin_list_unbox · 9b0a5610
  jiangxiulong authored May 27, 2022
  
  9b0a5610
- 去除字符串中的空格、回车、换行符、制表符 · dac9cfb1
  jiangxiulong authored May 27, 2022
  
  dac9cfb1
- Merge remote-tracking branch 'origin/hjc_goblin_list_unbox' into hjc_goblin_list_unbox · 2154d769
  胡佳晨 authored May 27, 2022
  
  2154d769
- 修改盲盒库存逻辑从兑换码复制 · 0a492977
  胡佳晨 authored May 27, 2022
  
  0a492977
- Merge remote-tracking branch 'origin/hjc_goblin_list_unbox' into hjc_goblin_list_unbox · 3e05a35f
  jiangxiulong authored May 27, 2022
  
  3e05a35f
- nft订单列表查询优化 · 860f4511
  jiangxiulong authored May 27, 2022
  
  860f4511
- Merge branch 'master' into hjc_goblin_list_unbox · 3aa26008
  胡佳晨 authored May 27, 2022
  
  3aa26008
- 修改盲盒库存逻辑从兑换码复制 · c6ff20ad
  胡佳晨 authored May 27, 2022
  
  c6ff20ad
- 修改盲盒库存逻辑从兑换码复制 · dc837c71
  胡佳晨 authored May 27, 2022
  
  dc837c71
26 May, 2022 4 commits
- Merge branch 'pre' into 'master' · 8d5049a1
  张禹 authored May 26, 2022
```
Pre

See merge request !243
```
  8d5049a1
- Merge remote-tracking branch 'origin/jxl_0525_nft_total' into pre · 01fc8df9
  jiangxiulong authored May 26, 2022
  
  01fc8df9
- 屏蔽nft消费中的eorro耗时日志 · df3257d7
  anjiabin authored May 26, 2022
  
  df3257d7
- 下单&兑换：订单增加字段ex_code和list_id · 2ea4f9fe
  jiangxiulong authored May 26, 2022
  
  2ea4f9fe
25 May, 2022 13 commits
- 修改创建分批购盲盒和删除逻辑 · b156e423
  胡佳晨 authored May 25, 2022
  
  b156e423
- 修改创建分批购盲盒和删除逻辑 · 8b4bc761
  胡佳晨 authored May 25, 2022
  
  8b4bc761
- 下单：判断是否有库存时候如果是分批购的盲盒不判断盲盒内藏品的开售时间 · a7ed7b2b
  jiangxiulong authored May 25, 2022
  
  a7ed7b2b
- 修改搜索接口 · fff44e8c
  胡佳晨 authored May 25, 2022
  
  fff44e8c
- Merge remote-tracking branch 'origin/hjc_goblin_list_unbox' into hjc_goblin_list_unbox · 2319decb
  胡佳晨 authored May 25, 2022
  
  2319decb
- 修改搜索接口 · 12c3dbef
  胡佳晨 authored May 25, 2022
  
  12c3dbef
- 盲盒计算库存的listId;判断是否有库存时候如果是分批购的盲盒不判断盲盒内藏品的开售时间 · 07a16922
  jiangxiulong authored May 25, 2022
  
  07a16922
- 回滚库存 listid用购买藏品的不管是普通还是盲盒 · 5d7a7063
  jiangxiulong authored May 25, 2022
  
  5d7a7063
- Merge remote-tracking branch 'origin/jxl_0525_nft_total' into hjc_goblin_list_unbox · ef94f49f
  jiangxiulong authored May 25, 2022
  
  ef94f49f
- 详情展示的总库存数量 · 59b4c145
  jiangxiulong authored May 25, 2022
  
  59b4c145
- 盲盒分批购listId用的盲盒的不是真正中奖藏品的 · 003654d1
  jiangxiulong authored May 25, 2022
  
  003654d1
- 增加分批购支持盲盒配置 · f538909b
  胡佳晨 authored May 25, 2022
```
增加 分批购 盲盒回滚逻辑
增加 nft商品详情 下个分段购开始时间
```
  f538909b
- 增加分批购支持盲盒配置 · 0d4bd919
  胡佳晨 authored May 25, 2022
```
增加 分批购 盲盒回滚逻辑
```
  0d4bd919
24 May, 2022 5 commits
- 增加分批购支持盲盒配置 · 99250889
  胡佳晨 authored May 24, 2022
  
  99250889
- 增加分批购支持盲盒配置 · db10662a
  胡佳晨 authored May 24, 2022
  
  db10662a
- Merge branch 'master' into hjc_goblin_list_unbox · 0a936419
  胡佳晨 authored May 24, 2022
  
  0a936419
- Merge branch 'pre' into 'master' · e33e076c
  Administrator authored May 24, 2022
```
Pre

See merge request !242
```
  e33e076c
- ~api:恢复我的藏品来源设置; · 6d8e1032
  zhanggb authored May 24, 2022
  
  6d8e1032
23 May, 2022 4 commits
- Merge branch 'hjc_goblin_list_fix' into pre · 94719480
  胡佳晨 authored May 23, 2022
  
  94719480
- 取消获取苹果支付类型需要token · ac3e0471
  胡佳晨 authored May 23, 2022
  
  ac3e0471
- bug：助理获取头像异常返回 · 2f49bc17
  高虎 authored May 23, 2022
  
  2f49bc17
- bug：助理头像保存异常问题 · 80874986
  高虎 authored May 23, 2022
  
  80874986