Commits · lifei_dev · camp / camp

27 May, 2020 1 commit
- 增加设置阿里云短信模板接口 · f424fa55
  lifei authored May 27, 2020
  
  f424fa55
26 May, 2020 2 commits
- 训练营短信群发助手功能finish · a1860434
  lifei authored May 26, 2020
  
  a1860434
- 提交临时代码 · aa98c6e0
  lifei authored May 26, 2020
  
  aa98c6e0
21 May, 2020 2 commits
- Merge remote-tracking branch 'origin/develop' into develop · 0d86f6fc
  liangchuang1027 authored May 21, 2020
  
  0d86f6fc
- 排除vip商品 · c3feffe3
  liangchuang1027 authored May 21, 2020
  
  c3feffe3
20 May, 2020 9 commits
- add · c9e32ff7
  马志宇 authored May 20, 2020
  
  c9e32ff7
- add · 9991814e
  马志宇 authored May 20, 2020
  
  9991814e
- Merge remote-tracking branch 'origin/develop' into develop · 8741c62d
  马志宇 authored May 20, 2020
  
  8741c62d
- fix · 88270054
  马志宇 authored May 20, 2020
  
  88270054
- update · 2df6a1fc
  liangchuang1027 authored May 20, 2020
  
  2df6a1fc
- Merge remote-tracking branch 'origin/develop' into develop · 2d2a3907
  liangchuang1027 authored May 20, 2020
  
  2d2a3907
- update · f4e2687e
  liangchuang1027 authored May 20, 2020
  
  f4e2687e
- fix · 8a09c7e5
  马志宇 authored May 20, 2020
  
  8a09c7e5
- add · db79921e
  马志宇 authored May 20, 2020
  
  db79921e
19 May, 2020 7 commits
- Merge remote-tracking branch 'origin/develop' into develop · 12ed704d
  liangchuang1027 authored May 19, 2020
  
  12ed704d
- 添加@FormDataJsonBody · 56f31e35
  liangchuang1027 authored May 19, 2020
  
  56f31e35
- Merge branch 'develop' of git.mixiong.mobi:camp/camp into develop · 22b8c35e
  马志宇 authored May 19, 2020
```
# Conflicts:
#	api/src/main/java/mobi/mixiong/camp/controller/douyin/DouYinOrderProcessorController.java
```
  22b8c35e
- Merge branch 'develop' of git.mixiong.mobi:camp/camp into develop · 4ea608c8
  马志宇 authored May 19, 2020
```
# Conflicts:
#	api/src/main/java/mobi/mixiong/camp/controller/douyin/DouYinOrderProcessorController.java
```
  4ea608c8
- add · 234bc89a
  马志宇 authored May 19, 2020
  
  234bc89a
- 添加@FormDataJsonBody · c37214d0
  liangchuang1027 authored May 19, 2020
  
  c37214d0
- 添加@FormDataJsonBody · b032193a
  liangchuang1027 authored May 19, 2020
  
  b032193a
18 May, 2020 2 commits
- add · 814e5ef8
  马志宇 authored May 18, 2020
  
  814e5ef8
- douYinOrderProcessor列表list\saveOrUpdate · a8b1fa96
  liangchuang1027 authored May 18, 2020
  
  a8b1fa96
15 May, 2020 5 commits
- update channel · 1c7a35de
  贾贺明 authored May 15, 2020
  
  1c7a35de
- update channel vip order · 3ed321c6
  贾贺明 authored May 15, 2020
  
  3ed321c6
- update channel vip add privilege · c54932a8
  贾贺明 authored May 15, 2020
  
  c54932a8
- bug fix · c91429db
  贾贺明 authored May 15, 2020
  
  c91429db
- bug fix · 2e265740
  贾贺明 authored May 15, 2020
  
  2e265740
14 May, 2020 8 commits
- add npe fix · b85712c9
  贾贺明 authored May 14, 2020
  
  b85712c9
- add 订单 · 7067d59a
  贾贺明 authored May 14, 2020
  
  7067d59a
- add 商品打折 · bcd507fc
  贾贺明 authored May 14, 2020
  
  bcd507fc
- add 商品增加折扣开始时间与结束时间 · 7338e3f1
  贾贺明 authored May 14, 2020
  
  7338e3f1
- add 渠道 · 141d0df8
  贾贺明 authored May 14, 2020
  
  141d0df8
- add · ac082b5f
  马志宇 authored May 14, 2020
  
  ac082b5f
- add · fdde5fe7
  马志宇 authored May 14, 2020
  
  fdde5fe7
- add · 8edccd29
  马志宇 authored May 14, 2020
  
  8edccd29
13 May, 2020 4 commits
- Merge remote-tracking branch 'origin/develop' into develop · b738247b
  马志宇 authored May 13, 2020
  
  b738247b
- add · d39b6293
  马志宇 authored May 13, 2020
  
  d39b6293
- update 按照publish——time倒序输出 · 4ba46202
  贾贺明 authored May 13, 2020
  
  4ba46202
- update · 2cd266d1
  贾贺明 authored May 13, 2020
```
add 白名单 二雷
```
  2cd266d1