Commits · 1a23c11b082cf164813f0a0b321afce8e0fcbdc9 · shenshaokai / jinfa-platform

31 Oct, 2022 13 commits
- fix: 修复新增合同的代码合并出的bug · 1a23c11b
  shenshaokai authored Oct 31, 2022
  
  1a23c11b
- fix: 修复物料页面进去报错问题 · 88e5f45e
  shenshaokai authored Oct 31, 2022
  
  88e5f45e
- fix: 接口token换成之前518的 · 50c399b3
  shenshaokai authored Oct 31, 2022
  
  50c399b3
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · 5152fadd
  shenshaokai authored Oct 31, 2022
```
fix: 登录逻辑恢复618的逻辑

See merge request project/jinfa-platform!341
```
  5152fadd
- fix: 登录逻辑恢复618的逻辑 · e9bd76a2
  shenshaokai authored Oct 31, 2022
  
  e9bd76a2
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · 46b63e56
  shenshaokai authored Oct 31, 2022
```
test: 测试登录用户信息

See merge request project/jinfa-platform!340
```
  46b63e56
- test: 测试登录用户信息 · 2ec5442d
  shenshaokai authored Oct 31, 2022
  
  2ec5442d
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · 30f9b939
  shenshaokai authored Oct 31, 2022
```
test: 调试登录问题

See merge request project/jinfa-platform!339
```
  30f9b939
- test: 调试登录问题 · a368d70e
  shenshaokai authored Oct 31, 2022
  
  a368d70e
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · e57d87ee
  shenshaokai authored Oct 31, 2022
```
test: 测试登录用户信息

See merge request project/jinfa-platform!338
```
  e57d87ee
- test: 测试登录用户信息 · 3ca6e5ad
  shenshaokai authored Oct 31, 2022
  
  3ca6e5ad
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · f727b3e8
  shenshaokai authored Oct 31, 2022
```
test: 测试登录问题

See merge request project/jinfa-platform!337
```
  f727b3e8
- test: 测试登录问题 · e067f8c5
  shenshaokai authored Oct 31, 2022
  
  e067f8c5
30 Oct, 2022 9 commits
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · f2132067
  shenshaokai authored Oct 30, 2022
```
fix: 登录后菜单显示问题

See merge request project/jinfa-platform!336
```
  f2132067
- fix: 登录后菜单显示问题 · 37060889
  shenshaokai authored Oct 30, 2022
  
  37060889
- feat: 订单-收货单 · 7b39bdf1
  shenshaokai authored Oct 30, 2022
  
  7b39bdf1
- feat: 订单-采购订单和收货单 · ddc34d8b
  shenshaokai authored Oct 30, 2022
  
  ddc34d8b
- feat: 结算-业务请款和应付账单 · 7f668d7c
  shenshaokai authored Oct 30, 2022
  
  7f668d7c
- feat: 合同管理-待新增合同 · 7d4e2865
  shenshaokai authored Oct 30, 2022
  
  7d4e2865
- Merge branch '1102' into 'jinfa-20221102' · dbaa6699
  前端-吴智勇 authored Oct 30, 2022
```
1102

See merge request project/jinfa-platform!335
```
  dbaa6699
- fix: 规则引擎路由合并 · 2ae6fc05
  wzy authored Oct 30, 2022
  
  2ae6fc05
- Merge branch 'jinfa-0618' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into 1102 · 68e98a17
  wzy authored Oct 30, 2022
  
  68e98a17
27 Oct, 2022 4 commits
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · 93f2da3a
  shenshaokai authored Oct 27, 2022
```
feat: 搬流程引擎合同,请购单,请款单的页面

See merge request project/jinfa-platform!334
```
  93f2da3a
- feat: 搬流程引擎合同,请购单,请款单的页面 · a493724e
  shenshaokai authored Oct 27, 2022
  
  a493724e
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · 6d3b5a4c
  shenshaokai authored Oct 27, 2022
```
fix: 菜单relationParentCode字段问题

See merge request project/jinfa-platform!333
```
  6d3b5a4c
- fix: 菜单relationParentCode字段问题 · d53cf49d
  shenshaokai authored Oct 27, 2022
  
  d53cf49d
26 Oct, 2022 3 commits
- Merge branch 'jinfa-20221102' into 'jinfa-20221102' · b8aa7400
  shenshaokai authored Oct 26, 2022
```
Jinfa 20221102

See merge request project/jinfa-platform!332
```
  b8aa7400
- feat: 去掉人民币符号 · a16fbd91
  shenshaokai authored Oct 26, 2022
  
  a16fbd91
- build: 修改1102 构建配置 · a504e4ac
  shenshaokai authored Oct 26, 2022
  
  a504e4ac
14 Oct, 2022 3 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 34ce74d8
  前端-吴智勇 authored Oct 14, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!330
```
  34ce74d8
- Merge branch 'jinfa-0518' of… · b8b855b7
  wzy authored Oct 14, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  b8b855b7
- fix: 去除时分秒 · 636ef66d
  wzy authored Oct 14, 2022
  
  636ef66d
11 Oct, 2022 2 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 1460250a
  前端-吴智勇 authored Oct 11, 2022
```
fix: 请购单剩余 为0处理

See merge request project/jinfa-platform!329
```
  1460250a
- fix: 请购单剩余为0处理 · 7a8b33ac
  wzy authored Oct 11, 2022
  
  7a8b33ac
10 Oct, 2022 6 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · fa1a1167
  前端-吴智勇 authored Oct 10, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!328
```
  fa1a1167
- Merge branch 'jinfa-0518' of… · 41de7a22
  wzy authored Oct 10, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  41de7a22
- fix：合同采购物料校验问题 · f4e6d1ef
  wzy authored Oct 10, 2022
  
  f4e6d1ef
- Merge branch 'jinfa-0518' into 'jinfa-0518' · aa43e8f5
  前端-吴智勇 authored Oct 10, 2022
```
fix: 采购物料为空问题处理

See merge request project/jinfa-platform!327
```
  aa43e8f5
- fix: 采购物料为空问题处理 · 199954d4
  wzy authored Oct 10, 2022
  
  199954d4
- Merge branch 'jinfa-0518' into 'jinfa-0518' · ec355f34
  前端-吴智勇 authored Oct 10, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!326
```
  ec355f34