Commits · 55c075ba3abcc4bcf89005a461efd5c0235026d4 · 赵剑炜 / jyzb_platformV2 · GitLab

29 Jan, 2024 4 commits
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 55c075ba
```
# Conflicts:
#	jyzb-process/src/main/java/com/junmp/junmpProcess/controller/SysFormController.java
```
  李小惠 committed Jan 29, 2024
  55c075ba Browse Files
- 修改orderMain数据结构 · 537013b1
  李小惠 committed Jan 29, 2024
  
  537013b1 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · 9ffdf864
  赵剑炜 committed Jan 29, 2024
  
  9ffdf864 Browse Files
- 调整流程表单接口 · ac4d74c2
  赵剑炜 committed Jan 29, 2024
  
  ac4d74c2 Browse Files
26 Jan, 2024 8 commits
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · e8f1eb20
  李小惠 committed Jan 26, 2024
  
  e8f1eb20 Browse Files
- 1 · cc7f65b8
  李小惠 committed Jan 26, 2024
  
  cc7f65b8 Browse Files
- 优化装备同步接口，修改库存管理显示错误bug，修改报表导出bug，编写超期物资接口（进度30%） · f3436321
  李小惠 committed Jan 26, 2024
  
  f3436321 Browse Files
- 添加删除流程 · a2f11920
  赵剑炜 committed Jan 26, 2024
  
  a2f11920 Browse Files
- 调整流程搭配设置 · 074c3b78
  赵剑炜 committed Jan 26, 2024
  
  074c3b78 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · adfd12ea
  赵剑炜 committed Jan 26, 2024
  
  adfd12ea Browse Files
- ws格式调整 · 865283a6
  赵剑炜 committed Jan 26, 2024
  
  865283a6 Browse Files
- 修改导出功能 · e9aef5b1
  李小惠 committed Jan 26, 2024
  
  e9aef5b1 Browse Files
24 Jan, 2024 5 commits
- 更新基础数据通知本地主机（上传到rabbitmq），修改密码接口平台与单警柜融合成一个接口，修改报表数据未显示完整或错误bug · 6738fb42
  李小惠 committed Jan 24, 2024
  
  6738fb42 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 1117d526
  李小惠 committed Jan 24, 2024
  
  1117d526 Browse Files
- 更新基础数据通知本地主机 · 0e0330b1
  李小惠 committed Jan 24, 2024
  
  0e0330b1 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · 2d985a79
  赵剑炜 committed Jan 24, 2024
  
  2d985a79 Browse Files
- 设备监控警柜demo · 5894695d
  赵剑炜 committed Jan 24, 2024
  
  5894695d Browse Files
23 Jan, 2024 10 commits
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 9c9ffee4
  李小惠 committed Jan 23, 2024
  
  9c9ffee4 Browse Files
- 新增类型图片以及新增库存接口返回图片 · 6ad08e10
  李小惠 committed Jan 23, 2024
  
  6ad08e10 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · bbe3f593
  赵剑炜 committed Jan 23, 2024
  
  bbe3f593 Browse Files
- 添加设备监控的ws类 · 7ae43aef
  赵剑炜 committed Jan 23, 2024
  
  7ae43aef Browse Files
- 新增type数据结构照片字段 · dd85f1bb
  李小惠 committed Jan 23, 2024
  
  dd85f1bb Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 66c605ee
  李小惠 committed Jan 23, 2024
  
  66c605ee Browse Files
- 修改配置文件 · f6ac9700
  李小惠 committed Jan 23, 2024
  
  f6ac9700 Browse Files
- 优化了绑定的逻辑 · 6620aba9
  赵剑炜 committed Jan 23, 2024
  
  6620aba9 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · 0c7db0a6
  赵剑炜 committed Jan 23, 2024
  
  0c7db0a6 Browse Files
- 无修改 · 73b4421d
  赵剑炜 committed Jan 23, 2024
  
  73b4421d Browse Files
22 Jan, 2024 10 commits
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 76ac6478
  李小惠 committed Jan 22, 2024
  
  76ac6478 Browse Files
- 修改装备号型和类型导出接口，修改单警柜出入库数据结构及接口 · 123d14e2
  李小惠 committed Jan 22, 2024
  
  123d14e2 Browse Files
- 在上一个接口基础上调整 · d8edd4b1
  赵剑炜 committed Jan 22, 2024
  
  d8edd4b1 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · b524c769
  赵剑炜 committed Jan 22, 2024
  
  b524c769 Browse Files
- 本地数据上报自测完成 · baa6b0ac
  赵剑炜 committed Jan 22, 2024
  
  baa6b0ac Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · a5f19520
  李小惠 committed Jan 22, 2024
  
  a5f19520 Browse Files
- 修改应用模块bug · c2a78484
  李小惠 committed Jan 22, 2024
  
  c2a78484 Browse Files
- 添加两个交换机主题 · 088becef
  赵剑炜 committed Jan 22, 2024
  
  088becef Browse Files
- 新增警员禁用警柜版 · 721d2f18
  赵剑炜 committed Jan 22, 2024
  
  721d2f18 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · c1549f9e
  李小惠 committed Jan 22, 2024
  
  c1549f9e Browse Files
19 Jan, 2024 3 commits
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · 0663c56b
  赵剑炜 committed Jan 19, 2024
  
  0663c56b Browse Files
- 新增警柜的人员信息 · 1c5a2b49
  赵剑炜 committed Jan 19, 2024
  
  1c5a2b49 Browse Files
- 修改除湿机报表接口以及测试，修改装备号型消息推送接口（可能有待改动优化，现在只是初版） · 30167ba0
  李小惠 committed Jan 19, 2024
  
  30167ba0 Browse Files