Commits · c734d17c4b456217ee185b2bfc805de8ecaace9d · zxw / JunmpPoliceStation

29 Dec, 2022 1 commit

物资详情换orgid
第三方停启用状态
第三方批量完成打印单
统计导出调整

committed Dec 29, 2022

c734d17c Browse Files

22 Dec, 2022 2 commits
- Merge branch 'develop' into zxw · 4366ac90
  zxw committed Dec 22, 2022
  
  4366ac90 Browse Files
- 1 · baf03e11
  zxw committed Dec 22, 2022
  
  baf03e11 Browse Files
16 Dec, 2022 1 commit
- IIS部署调整 · d342d5cc
  zxw committed Dec 16, 2022
  
  d342d5cc Browse Files
15 Dec, 2022 4 commits
- Merge branch 'master' into zxw · 663e2ed5
  zxw committed Dec 15, 2022
  
  663e2ed5 Browse Files
- Merge branch 'hotFix' of http://gitlab.sothing.top/zxw/JunmpPoliceStation into hotFix · a8f42e6a
  zxw committed Dec 15, 2022
  
  a8f42e6a Browse Files
- 1 · 8de6fa57
  zxw committed Dec 15, 2022
  
  8de6fa57 Browse Files
- 1214部署 · 88d3a752
  zxw committed Dec 15, 2022
  
  88d3a752 Browse Files
14 Dec, 2022 1 commit
- 调整各个视图，将报废的物资剔除于总数量 · 004884f2
  赵剑炜 committed Dec 14, 2022
  
  004884f2 Browse Files
13 Dec, 2022 3 commits
- 修正所有报表中错误的物资排序 · 4c472374
  赵剑炜 committed Dec 13, 2022
  
  4c472374 Browse Files
- Merge branch 'hotFix' of http://gitlab.sothing.top/zxw/JunmpPoliceStation into hotFix · 62993ca6
  zxw committed Dec 13, 2022
  
  62993ca6 Browse Files
- 修正注释 · ad331c3a
  zxw committed Dec 13, 2022
  
  ad331c3a Browse Files
12 Dec, 2022 4 commits
- 全局配置文件 · 0c60f4a7
  赵剑炜 committed Dec 12, 2022
  
  0c60f4a7 Browse Files
- 新增过滤 · 53824c2d
  zxw committed Dec 12, 2022
  
  53824c2d Browse Files
- 充电台数据不再上报 · ff25c5cf
  赵剑炜 committed Dec 12, 2022
  
  ff25c5cf Browse Files
- 修复储备统计报表中包含报销的物资 · 1aeb3531
  赵剑炜 committed Dec 12, 2022
  
  1aeb3531 Browse Files
07 Dec, 2022 4 commits
- Merge branch 'zxw' · b0e649ce
  zxw committed Dec 07, 2022
  
  b0e649ce Browse Files
- 12-07部署 · 99a8e7a9
  zxw committed Dec 07, 2022
  
  99a8e7a9 Browse Files
- 去除redis数据写入 · 63b28915
```
mqtt不记录连接断开数据

(cherry picked from commit ea5dfad7)
```
  zxw committed Dec 07, 2022
  63b28915 Browse Files
- 1 · 8fa4380a
  zxw committed Dec 07, 2022
  
  8fa4380a Browse Files
02 Dec, 2022 13 commits
- 调整数据库上下文关联 · e4279208
  zxw committed Dec 02, 2022
  
  e4279208 Browse Files
- Merge remote-tracking branch 'origin/develop' into zxw · 5cbfb0f5
  zxw committed Dec 02, 2022
  
  5cbfb0f5 Browse Files
- 修复单警柜错还的问题 · 56b5287f
  赵剑炜 committed Dec 02, 2022
  
  56b5287f Browse Files
- 去除redis数据写入 · ea5dfad7
```
mqtt不记录连接断开数据
```
  zxw committed Dec 02, 2022
  ea5dfad7 Browse Files
- 消息提醒 · 1bf10ca3
  zxw committed Dec 02, 2022
  
  1bf10ca3 Browse Files
- Merge remote-tracking branch 'origin/develop' into zxw · eb52b136
  zxw committed Dec 02, 2022
  
  eb52b136 Browse Files
- 单警柜修复无法解绑的问题 · 7d51a29f
  赵剑炜 committed Dec 02, 2022
  
  7d51a29f Browse Files
- 修复指纹无限添加 · 2cad055d
  zxw committed Dec 02, 2022
  
  2cad055d Browse Files
- 修改 · 39a6c3d5
  赵剑炜 committed Dec 02, 2022
  
  39a6c3d5 Browse Files
- 解决冲突 · 73e44909
  zxw committed Dec 02, 2022
  
  73e44909 Browse Files
- 消息提醒 · f4fbd11d
  zxw committed Dec 02, 2022
  
  f4fbd11d Browse Files
- Merge branch 'dev-zjw' into develop · 05ce1804
  赵剑炜 committed Dec 02, 2022
  
  05ce1804 Browse Files
- 修复统计报表信息 · b5febb2f
  赵剑炜 committed Dec 02, 2022
  
  b5febb2f Browse Files
01 Dec, 2022 2 commits
- 合并svn中的数据 · 757f88eb
  赵剑炜 committed Dec 01, 2022
  
  757f88eb Browse Files
- SVN版本合并上传 · f18553b0
  赵剑炜 committed Dec 01, 2022
  
  f18553b0 Browse Files
25 Nov, 2022 2 commits
- init · 162e7717
  zxw committed Nov 25, 2022
  
  162e7717 Browse Files
- init · cd1bd77e
  zxw committed Nov 25, 2022
  
  cd1bd77e Browse Files