Commits · 69a4a7525aec8916347ab1b8ad5d9956dddd8bbc · lanbaoming / jiedao-app-operator-master

23 Mar, 2023 6 commits
- Merge branch 'dev-financial' into dev1.6 · 69a4a752
  我在何方 authored Mar 23, 2023
  
  69a4a752
- Merge branch 'dev-financial' of... · eb14cecc
  我在何方 authored Mar 23, 2023
```
Merge branch 'dev-financial' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev-financial
```
  eb14cecc
- 更新 · 2f9c75a1
  我在何方 authored Mar 23, 2023
  
  2f9c75a1
- Merge remote-tracking branch 'origin/dev-financial' into dev-financial · a51650ae
  邓春圆 authored Mar 23, 2023
  
  a51650ae
- 佣金付款单模块 · d87c07ef
  邓春圆 authored Mar 23, 2023
  
  d87c07ef
- 新增收款单税率更新 · 7b53d2ce
  我在何方 authored Mar 23, 2023
  
  7b53d2ce
22 Mar, 2023 7 commits
- 后台入仓操作、补充、修改储位规则调整-前 · 179f418c
  Marcus authored Mar 22, 2023
```
https://zentao.test.jdshangmen.com/task-view-1635.html
```
  179f418c
- Merge branch 'dev1.6' into dev1.6-newWarehouseArea · 069404d8
  Marcus authored Mar 22, 2023
  
  069404d8
- 收款单审核更新 · 89f6c4fb
  我在何方 authored Mar 22, 2023
  
  89f6c4fb
- 收款单审核更新 · fab70531
  我在何方 authored Mar 22, 2023
  
  fab70531
- Merge remote-tracking branch 'origin/dev-financial' into dev-financial · 9cf4fdbf
  邓春圆 authored Mar 22, 2023
  
  9cf4fdbf
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · e1f7c558
  邓春圆 authored Mar 22, 2023
  
  e1f7c558
- 控货订单列表筛选-时间筛选支持时分秒 · 03ee36b1
  邓春圆 authored Mar 22, 2023
  
  03ee36b1
21 Mar, 2023 6 commits
- 财务收款单更新 · 083f2b23
  我在何方 authored Mar 21, 2023
  
  083f2b23
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · f90d8d48
  dragondean@qq.com authored Mar 21, 2023
  
  f90d8d48
- 订单操作日志 · 5a775a3d
  dragondean@qq.com authored Mar 21, 2023
  
  5a775a3d
- Merge branch 'zhto_dev' into dev1.6 · a0b3248a
  zhoutong authored Mar 21, 2023
  
  a0b3248a
- 提单托运人，国内外供应商 · 3b3a54f4
  zhoutong authored Mar 21, 2023
  
  3b3a54f4
- 增加仓库配置 · e3a27e88
  TIAN.DESHENG authored Mar 21, 2023
  
  e3a27e88
20 Mar, 2023 3 commits
- 更新收款单审核 · e279e0d0
  我在何方 authored Mar 20, 2023
  
  e279e0d0
- 供应商1.6 · 24852c90
  zhoutong authored Mar 20, 2023
  
  24852c90
- 新储位 · 2a475a4d
  Marcus authored Mar 20, 2023
  
  2a475a4d
17 Mar, 2023 7 commits
- Revert "时间选择器修改" · a0846bb3
  邓春圆 authored Mar 17, 2023
```
This reverts commit a1ff90ac.
```
  a0846bb3
- Revert "时间选择器修改" · a9e6e635
  邓春圆 authored Mar 17, 2023
```
This reverts commit 25b59bc8.
```
  a9e6e635
- 时间选择器修改 · a1ff90ac
  邓春圆 authored Mar 15, 2023
```
(cherry picked from commit 8a8e73a2)
```
  a1ff90ac
- 时间选择器修改 · 25b59bc8
  邓春圆 authored Mar 15, 2023
```
(cherry picked from commit b9fb72c9)
```
  25b59bc8
- 捷哥 · 172c8b4f
  dragondean@qq.com authored Mar 17, 2023
  
  172c8b4f
- 解决海运冲突 · 13fe9053
  dragondean@qq.com authored Mar 17, 2023
  
  13fe9053
- 合并dev分支 · f5728349
  dragondean@qq.com authored Mar 17, 2023
  
  f5728349
16 Mar, 2023 6 commits
- 完善报价单详情权限 · d216cab7
  dragondean@qq.com authored Mar 16, 2023
  
  d216cab7
- 提货默认时间格式化 · db653475
  houjn@hikoon.cn authored Mar 16, 2023
  
  db653475
- 控货的两个小bug · 44ac9d5a
  dragondean@qq.com authored Mar 16, 2023
  
  44ac9d5a
- Merge branch 'dev-financial' of... · 60ccd09b
  我在何方 authored Mar 16, 2023
```
Merge branch 'dev-financial' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev-financial
```
  60ccd09b
- 财务收款单审核相关页面 · 105600e0
  我在何方 authored Mar 16, 2023
  
  105600e0
- Merge remote-tracking branch 'origin/dev' into dev · bfa17f4a
  huyf authored Mar 16, 2023
  
  bfa17f4a
15 Mar, 2023 5 commits
- 提货时间增加默认当前时间 · 9449832e
  huyf authored Mar 15, 2023
  
  9449832e
- commit bug · 3c68b537
  TIAN.DESHENG authored Mar 15, 2023
  
  3c68b537
- commit bug · 0a1f3df5
  TIAN.DESHENG authored Mar 15, 2023
  
  0a1f3df5
- 我的部门目标 · e9164418
  huyf authored Mar 15, 2023
  
  e9164418
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 62f54dd1
  zhoutong authored Mar 15, 2023
  
  62f54dd1