Commits · d065d273154b78baa5acb41537706a97ed150155 · lanbaoming / jiedao-app-operator-master · GitLab

21 Apr, 2023 1 commit
- 修改3099缺陷 · d065d273
  huhaiqing authored Apr 21, 2023
  
  d065d273
19 Apr, 2023 5 commits
- 控货列表切换回来保留页码 · 6d96854c
  dragondean@qq.com authored Apr 19, 2023
  
  6d96854c
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 70e0423e
  dragondean@qq.com authored Apr 19, 2023
  
  70e0423e
- 控货状态筛选 · 1182cca0
  dragondean@qq.com authored Apr 19, 2023
  
  1182cca0
- Merge branch 'master' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · fc56b2a8
  houjn@hikoon.cn authored Apr 19, 2023
  
  fc56b2a8
- 控货小bug · ac599c66
  dragondean@qq.com authored Apr 19, 2023
  
  ac599c66
18 Apr, 2023 5 commits
- 修改订单特价的清关费字段 · 81cdc0af
  dragondean@qq.com authored Apr 18, 2023
  
  81cdc0af
- 去掉控货的订单状态筛选 · bb2f1948
  dragondean@qq.com authored Apr 18, 2023
  
  bb2f1948
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · 997d44f1
  houjn@hikoon.cn authored Apr 18, 2023
  
  997d44f1
- 后台订单转异，类型不填，可以提交，但异常未生产成功 · d17a8f5d
  黄卓 authored Apr 18, 2023
```
https://zentao.test.jdshangmen.com/bug-view-3074.html
```
  d17a8f5d
- 后台订单转异，类型不填，可以提交，但异常未生产成功 · 359fd3cb
  黄卓 authored Apr 18, 2023
```
https://zentao.test.jdshangmen.com/bug-view-3074.html
```
  359fd3cb
17 Apr, 2023 10 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · 403c5e7b
  houjn@hikoon.cn authored Apr 17, 2023
  
  403c5e7b
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · cfb3ca43
  dragondean@qq.com authored Apr 17, 2023
  
  cfb3ca43
- 路线价格批量拉黑和批量下架后保留当前页码 · ef96f7a8
  dragondean@qq.com authored Apr 17, 2023
  
  ef96f7a8
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · b42d12f0
  houjn@hikoon.cn authored Apr 17, 2023
  
  b42d12f0
- Merge remote-tracking branch 'origin/dev' into dev · f6fbe7e4
  houjn@hikoon.cn authored Apr 17, 2023
  
  f6fbe7e4
- 异常订单列表缓存搜索条件 · 2d7ccb22
  我在何方 authored Apr 17, 2023
  
  2d7ccb22
- Merge remote-tracking branch 'origin/dev' into dev · 110f479e
  houjn@hikoon.cn authored Apr 17, 2023
```
# Conflicts:
#	src/views/ecw/financial/receivable.vue
```
  110f479e
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · d6f9b4a6
  我在何方 authored Apr 17, 2023
  
  d6f9b4a6
- 异常订单列表缓存搜索条件 · 9b109628
  我在何方 authored Apr 17, 2023
  
  9b109628
- 异常订单搜索保存 · 036c71c0
  我在何方 authored Apr 17, 2023
  
  036c71c0
12 Apr, 2023 7 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · 3559ca1b
  houjn@hikoon.cn authored Apr 12, 2023
  
  3559ca1b
- Merge remote-tracking branch 'origin/dev' into dev · 4f2c8d90
  houjn@hikoon.cn authored Apr 12, 2023
  
  4f2c8d90
- 2988 · 38774cb8
  Marcus authored Apr 12, 2023
  
  38774cb8
- 2988 · 01a79d62
  Marcus authored Apr 12, 2023
  
  01a79d62
- Merge remote-tracking branch 'origin/dev' into dev · 6ec9f882
  houjn@hikoon.cn authored Apr 12, 2023
  
  6ec9f882
- 当未指定重泡货优惠时关闭指定线路，同是将指定线路的值置空。 · 3c567aca
  Marcus authored Apr 12, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2988.html
```
  3c567aca
- 控货订单导出 · 2d397751
  houjn@hikoon.cn authored Apr 12, 2023
  
  2d397751
11 Apr, 2023 3 commits
- Merge remote-tracking branch 'origin/dev' into dev · 7df9a27e
  houjn@hikoon.cn authored Apr 11, 2023
  
  7df9a27e
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 2268d1f5
  我在何方 authored Apr 11, 2023
  
  2268d1f5
- 异常订单搜索修复 · f40130e4
  我在何方 authored Apr 11, 2023
  
  f40130e4
10 Apr, 2023 2 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · d13618aa
  houjn@hikoon.cn authored Apr 10, 2023
  
  d13618aa
- 修复打印标签部分场景异常 · 63d91de7
  dragondean@qq.com authored Apr 10, 2023
  
  63d91de7
07 Apr, 2023 2 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · 77757482
  houjn@hikoon.cn authored Apr 07, 2023
  
  77757482
- 打印标签加超时时间 · 32e280c1
  dragondean@qq.com authored Apr 07, 2023
  
  32e280c1
05 Apr, 2023 5 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · a690ccbb
  houjn@hikoon.cn authored Apr 05, 2023
  
  a690ccbb
- 完善订单详情费用品名国际化 · 83bc67d4
  dragondean@qq.com authored Apr 05, 2023
  
  83bc67d4
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · 7059f00a
  houjn@hikoon.cn authored Apr 05, 2023
  
  7059f00a
- 复制dev1.6的翻译内容 · f38724b5
  dragondean@qq.com authored Apr 05, 2023
  
  f38724b5
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · b492a544
  houjn@hikoon.cn authored Apr 05, 2023
  
  b492a544