Commits · 991bbca19678d16de20a9d07e40a4e09fd4680da · tencent / services · GitLab

01 Aug, 2019 1 commit
- feat：店铺代理修改 · 991bbca1
  xmy committed Aug 01, 2019
  
  991bbca1 Browse Files
31 Jul, 2019 5 commits
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · 71e219e0
  王召彬 committed Jul 31, 2019
  
  71e219e0 Browse Files
- Merge branch 'fixbug-clslog' into test · 75459eca
  王召彬 committed Jul 31, 2019
  
  75459eca Browse Files
- 腾讯云记日志去掉延迟 · c4903972
  王召彬 committed Jul 31, 2019
  
  c4903972 Browse Files
- Merge branch 'fixbug-clslog' into test · 134fe2ea
  王召彬 committed Jul 31, 2019
  
  134fe2ea Browse Files
- 调用sleep时判断是否是协程模式 · e260d184
  王召彬 committed Jul 31, 2019
  
  e260d184 Browse Files
30 Jul, 2019 5 commits
- Merge branch 'ft-v1' into test · 6e9cc697
  zhangsong committed Jul 30, 2019
  
  6e9cc697 Browse Files
- 修改变量名 · 141a50aa
  zhangsong committed Jul 30, 2019
  
  141a50aa Browse Files
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · f875df1d
  zhangsong committed Jul 30, 2019
  
  f875df1d Browse Files
- Merge branch 'ft-v1' into test · 37a120f2
  zhangsong committed Jul 30, 2019
  
  37a120f2 Browse Files
- 添加次卡和储值卡cmq枚举 · 67018f49
  zhangsong committed Jul 30, 2019
  
  67018f49 Browse Files
19 Jul, 2019 4 commits
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · 54a908ea
  王召彬 committed Jul 19, 2019
  
  54a908ea Browse Files
- Merge branch 'ft-autoAddItems' into test · 5735c295
  王召彬 committed Jul 19, 2019
  
  5735c295 Browse Files
- 添加同步店员所属的商品的接口 · 981fa588
  王召彬 committed Jul 19, 2019
  
  981fa588 Browse Files
- feat：去除获取拼团新订单数量 · fbadeb5c
  xmy committed Jul 19, 2019
  
  fbadeb5c Browse Files
18 Jul, 2019 1 commit
- feat：统计评论数量 · bef2c86c
  xmy committed Jul 18, 2019
  
  bef2c86c Browse Files
15 Jul, 2019 8 commits
- 配合前端改版后端大调整 · fc0237cb
  王召彬 committed Jul 15, 2019
  
  fc0237cb Browse Files
- 解决冲突 · 3a751955
  王召彬 committed Jul 15, 2019
  
  3a751955 Browse Files
- Merge branch 'fixbug-cfgcenter' · 71f36bc3
  王召彬 committed Jul 15, 2019
  
  71f36bc3 Browse Files
- Merge branch 'feature-reserv' · 146ce275
  王召彬 committed Jul 15, 2019
  
  146ce275 Browse Files
- 流量和卡片接口修改 · da310ad7
  zhangsong committed Jul 15, 2019
  
  da310ad7 Browse Files
- Merge branch 'wj' of http://git.dev.2b3.cn/tencent/services · 2abc040f
  王洁 committed Jul 15, 2019
  
  2abc040f Browse Files
- Merge remote-tracking branch 'origin/master' · ba158702
```
# Conflicts:
#	UPGRADE_2.x.md
```
  xmy committed Jul 15, 2019
  ba158702 Browse Files
- 根据条件查询店铺订单数量 · dea2d985
  dzhang committed Jul 15, 2019
  
  dea2d985 Browse Files
13 Jul, 2019 16 commits
- Merge branch 'fixbug-cfgcenter' into test · dac6cf17
  王召彬 committed Jul 13, 2019
  
  dac6cf17 Browse Files
- 去掉空事务 · e0214e11
  王召彬 committed Jul 13, 2019
  
  e0214e11 Browse Files
- Merge branch 'fixbug-cfgcenter' into test · 4ab19eea
  王召彬 committed Jul 13, 2019
  
  4ab19eea Browse Files
- test · 5c87effe
  王召彬 committed Jul 13, 2019
  
  5c87effe Browse Files
- Merge branch 'fixbug-cfgcenter' into test · f7a8665c
  王召彬 committed Jul 13, 2019
  
  f7a8665c Browse Files
- test · 88addfa6
  王召彬 committed Jul 13, 2019
  
  88addfa6 Browse Files
- Merge branch 'fixbug-cfgcenter' into test · 5b31f06e
  王召彬 committed Jul 13, 2019
  
  5b31f06e Browse Files
- test · e26b0738
  王召彬 committed Jul 13, 2019
  
  e26b0738 Browse Files
- Merge branch 'fixbug-cfgcenter' into test · de27a0e4
  王召彬 committed Jul 13, 2019
  
  de27a0e4 Browse Files
- 增加代码说明 · 2320735c
  王召彬 committed Jul 13, 2019
  
  2320735c Browse Files
- Merge branch 'fixbug-cfgcenter' into test · 34e5a12c
  王召彬 committed Jul 13, 2019
  
  34e5a12c Browse Files
- 增加返回数组格式的方法 · c8d90818
  王召彬 committed Jul 13, 2019
  
  c8d90818 Browse Files
- Merge branch 'fixbug-cfgcenter' into test · 89bfbccb
  王召彬 committed Jul 13, 2019
  
  89bfbccb Browse Files
- 配置中心读取配置支持默认值和返回类型 · 017a99d2
  王召彬 committed Jul 13, 2019
  
  017a99d2 Browse Files
- Merge branch 'test' of http://git.dev.2b3.cn/tencent/services into test · 2bff67b5
  王召彬 committed Jul 13, 2019
  
  2bff67b5 Browse Files
- test · c2f1d95d
  王召彬 committed Jul 13, 2019
  
  c2f1d95d Browse Files