Commits · 36e6e00dddd80a94e45119f84cea406b70ab531f · dws / dwsproject · GitLab

28 Jan, 2026 3 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 36e6e00d
  wangkangjie committed Jan 28, 2026
  
  36e6e00d Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · ced6bb5e
```
创建时间先排序

See merge request !37
```
  马丽华 committed Jan 28, 2026
  ced6bb5e Browse Files
- 创建时间先排序 · 2ab6d1cf
  malihua committed Jan 28, 2026
  
  2ab6d1cf Browse Files
28 Nov, 2025 3 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · b86c94fa
  wangkangjie committed Nov 28, 2025
  
  b86c94fa Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · 93265897
```
显示金额

See merge request !36
```
  马丽华 committed Nov 28, 2025
  93265897 Browse Files
- 显示金额 · 9c9ad68a
  malihua committed Nov 28, 2025
  
  9c9ad68a Browse Files
13 Nov, 2025 3 commits
- 继续修改 loading 加载问题 · 17a83e40
  延飞李 committed Nov 13, 2025
  
  17a83e40 Browse Files
- 继续修改 loading 一直显示问题 · db01bd32
  延飞李 committed Nov 13, 2025
  
  db01bd32 Browse Files
- oee时间利用率 loading 提示优化 · 1a039f47
  延飞李 committed Nov 13, 2025
  
  1a039f47 Browse Files
30 Oct, 2025 9 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 5b496975
  wangkangjie committed Oct 30, 2025
  
  5b496975 Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · 6f8f0893
```
财务收支记录

See merge request !35
```
  马丽华 committed Oct 30, 2025
  6f8f0893 Browse Files
- 财务收支记录 · d4d7c7f3
  malihua committed Oct 30, 2025
  
  d4d7c7f3 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · bf729c8f
  wangkangjie committed Oct 30, 2025
  
  bf729c8f Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · cdd07d60
```
Mlh jzjx project

See merge request !34
```
  马丽华 committed Oct 30, 2025
  cdd07d60 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject into mlh_jzjx_project · 03fb64df
  malihua committed Oct 30, 2025
  
  03fb64df Browse Files
- 财务收支记录 · 5d9134d7
  malihua committed Oct 30, 2025
  
  5d9134d7 Browse Files
- Merge branch 'mlh-dev' into 'master' · f6c884f2
```
看板增加车间

See merge request !33
```
  马丽华 committed Oct 30, 2025
  f6c884f2 Browse Files
- 看板增加车间 · a646513e
  malihua committed Oct 30, 2025
  
  a646513e Browse Files
21 Oct, 2025 1 commit
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 64d5dd66
  wangkangjie committed Oct 21, 2025
  
  64d5dd66 Browse Files
20 Oct, 2025 3 commits
- Merge branch 'mlh_jzjx_project' into 'master' · 04c3b25c
```
收入支出合计

See merge request !32
```
  马丽华 committed Oct 20, 2025
  04c3b25c Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject into mlh_jzjx_project · 1681e680
  malihua committed Oct 20, 2025
  
  1681e680 Browse Files
- 收入支出合计 · 28dbdfb0
  malihua committed Oct 20, 2025
  
  28dbdfb0 Browse Files
28 Sep, 2025 3 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · c5d75041
  wangkangjie committed Sep 28, 2025
  
  c5d75041 Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · 2d5c9ae8
```
bug

See merge request !31
```
  马丽华 committed Sep 28, 2025
  2d5c9ae8 Browse Files
- bug · 40c7aaf6
  malihua committed Sep 28, 2025
  
  40c7aaf6 Browse Files
26 Sep, 2025 4 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 0b6ef68d
  wangkangjie committed Sep 26, 2025
  
  0b6ef68d Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · ca3eefad
```
玖姿空值转换

See merge request !30
```
  马丽华 committed Sep 26, 2025
  ca3eefad Browse Files
- 玖姿空值转换 · ff93a123
  malihua committed Sep 26, 2025
  
  ff93a123 Browse Files
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 0e6dd7f1
  wangkangjie committed Sep 26, 2025
  
  0e6dd7f1 Browse Files
25 Sep, 2025 2 commits
- Merge branch 'mlh_jzjx_project' into 'master' · c7b10f38
```
收支表保存提速

See merge request !29
```
  马丽华 committed Sep 25, 2025
  c7b10f38 Browse Files
- 收支表保存提速 · d42fb772
  malihua committed Sep 25, 2025
  
  d42fb772 Browse Files
18 Sep, 2025 3 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 8e1ad18f
  wangkangjie committed Sep 18, 2025
  
  8e1ad18f Browse Files
- Merge branch 'mlh_jzjx_project' into 'master' · 9802149c
```
结余字段存表

See merge request !28
```
  马丽华 committed Sep 18, 2025
  9802149c Browse Files
- 结余字段存表 · d0c23ebe
  malihua committed Sep 18, 2025
  
  d0c23ebe Browse Files
16 Sep, 2025 2 commits
- Merge branch 'hcw-dev' into 'master' · 3552e830
```
修改OEE计算公式

See merge request !27
```
  胡传伟 committed Sep 16, 2025
  3552e830 Browse Files
- 修改OEE计算公式 · 6327144f
  胡传伟 committed Sep 16, 2025
  
  6327144f Browse Files
15 Sep, 2025 4 commits
- Merge branch 'master' of https://git.rokedata.com/dws/dwsproject · 4da2c6b6
  wangkangjie committed Sep 15, 2025
  
  4da2c6b6 Browse Files
- Merge branch 'jzjx_project' into 'master' · efd13e07
```
Jzjx project

See merge request !26
```
  马丽华 committed Sep 15, 2025
  efd13e07 Browse Files
- Merge branch 'mlh_jzjx_project' into 'jzjx_project' · 260a1d01
```
收入支出表接口换成SQL

See merge request !25
```
  马丽华 committed Sep 15, 2025
  260a1d01 Browse Files
- 收入支出表接口换成SQL · 9b8a20a0
  malihua committed Sep 15, 2025
  
  9b8a20a0 Browse Files