Commits · c91335d92982cee9158230b9d78f2f98d9148d65 · lanbaoming / jiedao-app-operator-master

15 Jan, 2023 1 commit
- 打印入仓单必须选择品名，未选择品名不可点击确认打印 · c91335d9
  Marcus authored Jan 15, 2023
```
http://zentao.jdshangmen.com/bug-view-2028.html
```
  c91335d9
05 Jan, 2023 2 commits
- 入仓页面总方数、总重量宽度过小 · 9b66692e
  Marcus authored Jan 05, 2023
```
http://zentao.jdshangmen.com/bug-view-2015.html
```
  9b66692e
- 入仓相关缺少翻译 · 72eaf78e
  Marcus authored Jan 05, 2023
```
http://zentao.jdshangmen.com/bug-view-1989.html
```
  72eaf78e
04 Jan, 2023 5 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · d58cf469
  dragondean@qq.com authored Jan 04, 2023
  
  d58cf469
- 完善国际化 · 223ee884
  dragondean@qq.com authored Jan 04, 2023
  
  223ee884
- Merge remote-tracking branch 'origin/dev' into dev · 2a75db02
  邓春圆 authored Jan 04, 2023
  
  2a75db02
- 国际化优化 · ddb44095
  邓春圆 authored Jan 04, 2023
  
  ddb44095
- 修复优惠的货币单位限制 · 235d5aad
  dragondean@qq.com authored Jan 04, 2023
  
  235d5aad
03 Jan, 2023 1 commit
- 优惠单位和翻译 · 3bca5b87
  dragondean@qq.com authored Jan 03, 2023
  
  3bca5b87
02 Jan, 2023 10 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 9f34301e
  dragondean@qq.com authored Jan 02, 2023
  
  9f34301e
- 部分bug · a5b83de3
  dragondean@qq.com authored Jan 02, 2023
  
  a5b83de3
- 修海运问题 · 6d37376a
  huhaiqing authored Jan 02, 2023
  
  6d37376a
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 054714e3
  dragondean@qq.com authored Jan 02, 2023
  
  054714e3
- 我的站内信国际化报错 bug修复 · 554c13af
  邓春圆 authored Jan 02, 2023
  
  554c13af
- 客户详情-订单统计，根据运输方式-海空联运条件查询结果不正确 bug修复 · 2cf7ea77
  邓春圆 authored Jan 02, 2023
  
  2cf7ea77
- 始发仓缺少外部仓标识 · 9f097e0c
  邓春圆 authored Jan 02, 2023
  
  9f097e0c
- 分页bug修复 · 682a4d2e
  邓春圆 authored Jan 02, 2023
  
  682a4d2e
- mutualOrderId 修改 · c2d406b6
  邓春圆 authored Jan 02, 2023
  
  c2d406b6
- relateOrderId 修改 · f53e3ad8
  邓春圆 authored Jan 02, 2023
  
  f53e3ad8
01 Jan, 2023 2 commits
- 导航栏翻译 · f88f9b7c
  Marcus authored Jan 01, 2023
  
  f88f9b7c
- 入仓相关缺少翻译 · 0e667eb6
  Marcus authored Jan 01, 2023
```
http://zentao.jdshangmen.com/bug-view-1989.html
```
  0e667eb6
31 Dec, 2022 5 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 563e6887
  我在何方 authored Dec 31, 2022
  
  563e6887
- 预付异常修复 · ac3130e4
  我在何方 authored Dec 31, 2022
  
  ac3130e4
- 海运国际化补全 · 3f7b43f0
  huhaiqing authored Dec 31, 2022
  
  3f7b43f0
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 0e778b8e
  dragondean@qq.com authored Dec 31, 2022
  
  0e778b8e
- 优惠编辑页面二选一的提示 · fe8f1e62
  dragondean@qq.com authored Dec 31, 2022
  
  fe8f1e62
30 Dec, 2022 14 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 050ee02c
  我在何方 authored Dec 30, 2022
  
  050ee02c
- 收款单修复 · 9339cc69
  我在何方 authored Dec 30, 2022
  
  9339cc69
- 个人中心翻译 · 0cca163a
  Marcus authored Dec 30, 2022
  
  0cca163a
- 首页翻译 · 2f177f15
  Marcus authored Dec 30, 2022
  
  2f177f15
- Merge remote-tracking branch 'origin/dev' into dev · e45a01d6
  Marcus authored Dec 30, 2022
```
# Conflicts:
#	src/i18n/languages/en_US.json
```
  e45a01d6
- 翻译 · 5a322381
  Marcus authored Dec 30, 2022
  
  5a322381
- 翻译 · 3af5883f
  houjn@hikoon.cn authored Dec 30, 2022
  
  3af5883f
- 翻译器 · a71fe96f
  Marcus authored Dec 30, 2022
  
  a71fe96f
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 5ea56b38
  dragondean@qq.com authored Dec 30, 2022
  
  5ea56b38
- 修复查看的时候全部库存商品勾选异常 · 29e8e093
  dragondean@qq.com authored Dec 30, 2022
  
  29e8e093
- 翻译器 · 493f833a
  黄卓 authored Dec 30, 2022
  
  493f833a
- 海运翻译 · 55fc0b3a
  houjn@hikoon.cn authored Dec 30, 2022
  
  55fc0b3a
- 修复海运问题 · c733aecb
  huhaiqing authored Dec 30, 2022
  
  c733aecb
- 海运国际化补充 · 8c80ed35
  huhaiqing authored Dec 30, 2022
  
  8c80ed35