Commits · 86e18fe418662990607b80524910c610d2d50c17 · new-sing / admin-base

18 Jan, 2019 1 commit

wangwei authored Jan 18, 2019

	2.商品列表绑定商品和冲突商品前加上商品编号
	3.系统管理配置中打卡分享商品改为下拉选择

86e18fe4

17 Jan, 2019 3 commits
- Merge remote-tracking branch 'origin/master' · 0bacceb3
  wangwei authored Jan 17, 2019
```
# Conflicts:
#	dev/static/js/30.53db920d19e285c926b1.js
#	dev/static/js/31.24412563c9f33eb72a56.js
```
  0bacceb3
- 积分列表打包 · a2c640e9
  wangwei authored Jan 17, 2019
  
  a2c640e9
- 积分列表打包 · e55f2c63
  wangwei authored Jan 17, 2019
  
  e55f2c63
16 Jan, 2019 1 commit
- 打包 · a1ed0529
  wangwei authored Jan 16, 2019
  
  a1ed0529
11 Jan, 2019 5 commits
- 打包 · ffd02472
  wangwei authored Jan 11, 2019
  
  ffd02472
- Merge remote-tracking branch 'origin/development' into development · 69a5494b
  wangwei authored Jan 11, 2019
  
  69a5494b
- 打包预览功能 · 843213d9
  wangwei authored Jan 11, 2019
  
  843213d9
- 系统配置 · 7d9066c0
  chenfenglei authored Jan 11, 2019
  
  7d9066c0
- 系统配置 · f341d80b
  chenfenglei authored Jan 11, 2019
  
  f341d80b
10 Jan, 2019 1 commit
- 积分列表 · fe54bff4
  chenfenglei authored Jan 10, 2019
  
  fe54bff4
09 Jan, 2019 6 commits
- 打包 · 61fbe2f0
  wangwei authored Jan 09, 2019
  
  61fbe2f0
- Merge remote-tracking branch 'origin/development' into development · c013830d
  wangwei authored Jan 09, 2019
  
  c013830d
- 优化二维码上下位置替换+正式测试的无需登录全局变量配置 · 13e7fa96
  chenfenglei authored Jan 09, 2019
  
  13e7fa96
- 优化二维码上下位置替换+正式测试的无需登录全局变量配置 · a102f350
  chenfenglei authored Jan 09, 2019
  
  a102f350
- 优化二维码上下位置替换 · 2dd0fcde
  chenfenglei authored Jan 09, 2019
  
  2dd0fcde
- 优化二维码上下位置替换 · bff70189
  chenfenglei authored Jan 09, 2019
  
  bff70189
08 Jan, 2019 4 commits
- 打包 · fa7fbd40
  wangwei authored Jan 08, 2019
  
  fa7fbd40
- Merge remote-tracking branch 'origin/development' into development · 47261e73
  wangwei authored Jan 08, 2019
  
  47261e73
- 云集加m购买人搜索 · ca92d720
  chenfenglei authored Jan 08, 2019
  
  ca92d720
- 海报 · 09a6c779
  chenfenglei authored Jan 08, 2019
  
  09a6c779
07 Jan, 2019 3 commits
- 打包 · c1295c86
  wangwei authored Jan 07, 2019
  
  c1295c86
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into devlopment · 70679bb9
  chenfenglei authored Jan 07, 2019
  
  70679bb9
- 优化样式 · 2edd3261
  chenfenglei authored Jan 07, 2019
  
  2edd3261
04 Jan, 2019 7 commits
- 打包 · 0080b422
  wangwei authored Jan 04, 2019
  
  0080b422
- 来源码增加code筛选 · b1865021
  chenfenglei authored Jan 04, 2019
  
  b1865021
- 来源码增加code筛选 · 68457286
  chenfenglei authored Jan 04, 2019
  
  68457286
- 二维码管理bug · fb3f434f
  chenfenglei authored Jan 04, 2019
  
  fb3f434f
- 二维码管理bug · bdf04581
  chenfenglei authored Jan 04, 2019
  
  bdf04581
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into devlopment · a47c4d00
  chenfenglei authored Jan 04, 2019
  
  a47c4d00
- 二维码管理bug · 5a81b099
  chenfenglei authored Jan 04, 2019
  
  5a81b099
03 Jan, 2019 9 commits
- 打包 · 225569c5
  wangwei authored Jan 03, 2019
  
  225569c5
- 商品列表跳转期数列表 · fea2f530
  chenfenglei authored Jan 03, 2019
  
  fea2f530
- 商品列表跳转期数列表 · 4681fedf
  chenfenglei authored Jan 03, 2019
  
  4681fedf
- 商品列表跳转期数列表 · 9ce0c4c4
  chenfenglei authored Jan 03, 2019
  
  9ce0c4c4
- 商品列表跳转期数列表 · 11c572a7
  chenfenglei authored Jan 03, 2019
  
  11c572a7
- 商品列表跳转期数列表 · f8c690e9
  chenfenglei authored Jan 03, 2019
  
  f8c690e9
- 商品列表跳转期数列表 · 824ffa97
  chenfenglei authored Jan 03, 2019
  
  824ffa97
- 来源码类别 · 72e03b3e
  chenfenglei authored Jan 03, 2019
  
  72e03b3e
- 来源码类别 · 9450d59e
  chenfenglei authored Jan 03, 2019
  
  9450d59e