Commits · 6bc3822bf12a7a2dbaaf58603812939b1f4c1907 · chenzhifeng / jinfa-platform · GitLab

15 Oct, 2020 7 commits
- Merge branch 'dev' into test · 6bc3822b
  前端-钟卫鹏 authored Oct 15, 2020
  
  6bc3822b
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 251ac9fc
  前端-钟卫鹏 authored Oct 15, 2020
  
  251ac9fc
- fix:交易规则排除已设置商品 · 3307f15f
  前端-钟卫鹏 authored Oct 15, 2020
  
  3307f15f
- Merge branch 'dev' into test · 221da183
  Bill authored Oct 15, 2020
  
  221da183
- 添加路由注释 · ba817cdb
  Bill authored Oct 15, 2020
  
  ba817cdb
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 3e2d8bc1
  Bill authored Oct 15, 2020
  
  3e2d8bc1
- 修改仓位删除bug · 2bf79e86
  Bill authored Oct 15, 2020
  
  2bf79e86
14 Oct, 2020 17 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 10c01578
  前端-黄佳鑫 authored Oct 14, 2020
  
  10c01578
- 1.询价报价页面布局，接口接入 2.确认询价报价页面布局 · b4ff69e6
  前端-黄佳鑫 authored Oct 14, 2020
  
  b4ff69e6
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 259dff07
  Bill authored Oct 14, 2020
  
  259dff07
- 模态框Table, 新建通知单 · bfb1899d
  Bill authored Oct 14, 2020
  
  bfb1899d
- Merge branch 'dev' into test · 9ac4a889
  GuanHua authored Oct 14, 2020
  
  9ac4a889
- feat:商品收藏价格显示和取消收藏参数问题 · 8ff562b6
  GuanHua authored Oct 14, 2020
  
  8ff562b6
- Merge branch 'dev' into test · 39114c3b
  GuanHua authored Oct 14, 2020
  
  39114c3b
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ddc91bed
  GuanHua authored Oct 14, 2020
  
  ddc91bed
- feat:购买商品时角色类型和是否自己商品的判断 · 800f6362
  GuanHua authored Oct 14, 2020
  
  800f6362
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · 4aa36959
  前端-许佳敏 authored Oct 14, 2020
  
  4aa36959
- :wq · 79fad5cf
  前端-许佳敏 authored Oct 14, 2020
```
Merge branch 'dev' into test
```
  79fad5cf
- '新建物流单的发货单字段修改' · 32854e1f
  LeeJiancong authored Oct 14, 2020
  
  32854e1f
- fix:销售订单下单模式显示错误 · 26aeae59
  前端-许佳敏 authored Oct 14, 2020
  
  26aeae59
- '物流模板配送地址展示' · db324e9d
  LeeJiancong authored Oct 14, 2020
  
  db324e9d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 429dc474
  前端-钟卫鹏 authored Oct 14, 2020
  
  429dc474
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a4ead132
  前端-许佳敏 authored Oct 14, 2020
  
  a4ead132
- 修改权限 · b50b1d34
  前端-许佳敏 authored Oct 14, 2020
  
  b50b1d34
13 Oct, 2020 16 commits
- fix商品没有品牌报错的问题 · 982443c3
  XieZhiXiong authored Oct 13, 2020
  
  982443c3
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 0058ef59
  XieZhiXiong authored Oct 13, 2020
  
  0058ef59
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 4e99a053
  Bill authored Oct 13, 2020
  
  4e99a053
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 80449267
  Bill authored Oct 13, 2020
  
  80449267
- 添加加工详情 · eecd7ca7
  Bill authored Oct 13, 2020
  
  eecd7ca7
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 2ced405d
  前端-黄佳鑫 authored Oct 13, 2020
  
  2ced405d
- 询价报价&商品询价 · 59f25fd9
  前端-黄佳鑫 authored Oct 13, 2020
  
  59f25fd9
- Merge branch 'dev' into test · d6caf595
  前端-许佳敏 authored Oct 13, 2020
  
  d6caf595
- fix:注册页写死 · 5c957c35
  前端-许佳敏 authored Oct 13, 2020
  
  5c957c35
- Merge branch 'dev' into test · d77e70a8
  前端-许佳敏 authored Oct 13, 2020
  
  d77e70a8
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · c88c0b06
  GuanHua authored Oct 13, 2020
  
  c88c0b06
- feat:售后换货页面 · c7f5607e
  GuanHua authored Oct 13, 2020
  
  c7f5607e
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · 4e7a4584
  前端-许佳敏 authored Oct 13, 2020
  
  4e7a4584
- Merge branch 'dev' into test · 00af80e5
  前端-许佳敏 authored Oct 13, 2020
  
  00af80e5
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 97df3754
  前端-许佳敏 authored Oct 13, 2020
  
  97df3754
- feat:手工下单收货 · 5e3339df
  前端-许佳敏 authored Oct 13, 2020
  
  5e3339df