Commits · 22dd9de46b324130b2f3d5b69ece849a53eb9182 · 赵剑炜 / jyzb_platformV2 · GitLab

22 Mar, 2024 3 commits
- 去掉重复的盘点请求实体类属性 · 22dd9de4
  李小惠 committed Mar 22, 2024
  
  22dd9de4 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 796f44fd
```
# Conflicts:
#	jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
```
  李小惠 committed Mar 22, 2024
  796f44fd Browse Files
- 调整记账接口，修改现场问题bug · b7cbd956
  李小惠 committed Mar 22, 2024
  
  b7cbd956 Browse Files
20 Mar, 2024 1 commit
- 调整配置 · 2cac5a6e
  赵剑炜 committed Mar 20, 2024
  
  2cac5a6e Browse Files
15 Mar, 2024 5 commits
- 盘点上报时不删除销毁物资 · ddcedce8
  赵剑炜 committed Mar 15, 2024
  
  ddcedce8 Browse Files
- 调整盘点分页查询业务 · 45f31323
  赵剑炜 committed Mar 15, 2024
  
  45f31323 Browse Files
- 盘点规则调整 · 4a5f85bf
  赵剑炜 committed Mar 15, 2024
  
  4a5f85bf Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 590bb009
  李小惠 committed Mar 15, 2024
  
  590bb009 Browse Files
- 修改调岗逻辑 · d4515749
  李小惠 committed Mar 15, 2024
  
  d4515749 Browse Files
14 Mar, 2024 5 commits
- 1 · cc3ef798
  李小惠 committed Mar 14, 2024
  
  cc3ef798 Browse Files
- 添加警员查询条件，修改记账接口 · 48c35e35
  李小惠 committed Mar 14, 2024
  
  48c35e35 Browse Files
- 自测 · 94dd296d
  赵剑炜 committed Mar 14, 2024
  
  94dd296d Browse Files
- 修改盘点BUG · 908ffa2c
  赵剑炜 committed Mar 14, 2024
  
  908ffa2c Browse Files
- 1 · 90e78870
  李小惠 committed Mar 14, 2024
  
  90e78870 Browse Files
13 Mar, 2024 7 commits
- 添加装备类别和号型存入ES的定时任务，修改装备导入接口。 · 89e5e9af
  李小惠 committed Mar 14, 2024
  
  89e5e9af Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · c72fec69
  李小惠 committed Mar 14, 2024
  
  c72fec69 Browse Files
- 修改OAbug · 6067a0b5
  李小惠 committed Mar 14, 2024
  
  6067a0b5 Browse Files
- 调整上报数据格式 · b0d1156d
  赵剑炜 committed Mar 13, 2024
  
  b0d1156d Browse Files
- 调整上传的接口 · 7c1cf633
  赵剑炜 committed Mar 13, 2024
  
  7c1cf633 Browse Files
- 修改取消盘点后消息推送的具体内容 · 4e7d8d15
  赵剑炜 committed Mar 13, 2024
  
  4e7d8d15 Browse Files
- 修改远程开门 · 43e846c4
  赵剑炜 committed Mar 13, 2024
  
  43e846c4 Browse Files
12 Mar, 2024 5 commits
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 854ca8d5
  李小惠 committed Mar 12, 2024
  
  854ca8d5 Browse Files
- 调整库存管理接口 · 3fd65719
  李小惠 committed Mar 12, 2024
  
  3fd65719 Browse Files
- 消息队列中文问题 · f7c18943
  赵剑炜 committed Mar 12, 2024
  
  f7c18943 Browse Files
- 调整盘点消息推送 · 70afe0bb
  赵剑炜 committed Mar 12, 2024
  
  70afe0bb Browse Files
- 新增盘点详情接口 · 641924f9
  赵剑炜 committed Mar 12, 2024
  
  641924f9 Browse Files
11 Mar, 2024 7 commits
- 修改异常信息 · c6cfbf1f
  李小惠 committed Mar 11, 2024
  
  c6cfbf1f Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 41b9c058
```
# Conflicts:
#	jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/InventoryExceptionEnum.java
```
  李小惠 committed Mar 11, 2024
  41b9c058 Browse Files
- 修改消息推送接口 · 2bc058cc
  李小惠 committed Mar 11, 2024
  
  2bc058cc Browse Files
- 盘点功能修改 · d0f6d648
  赵剑炜 committed Mar 11, 2024
  
  d0f6d648 Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · b1a0cb3a
  赵剑炜 committed Mar 11, 2024
  
  b1a0cb3a Browse Files
- 调整盘点功能 · d61ba5bf
  赵剑炜 committed Mar 11, 2024
  
  d61ba5bf Browse Files
- 修改已读消息接口，编写出入库日志通用方法 · 2d1327f9
  李小惠 committed Mar 11, 2024
  
  2d1327f9 Browse Files
10 Mar, 2024 5 commits
- 盘点新增消息推送 · cf038366
  赵剑炜 committed Mar 10, 2024
  
  cf038366 Browse Files
- 调整盘点单据 · 53532981
  赵剑炜 committed Mar 10, 2024
  
  53532981 Browse Files
- 修改盘点功能 · af39161a
  赵剑炜 committed Mar 10, 2024
  
  af39161a Browse Files
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw · b413bd27
```
# Conflicts:
#	jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
```
  赵剑炜 committed Mar 10, 2024
  b413bd27 Browse Files
- sumMap微调 · 66bfb3f0
  赵剑炜 committed Mar 10, 2024
  
  66bfb3f0 Browse Files
09 Mar, 2024 1 commit
- 修改记账接口bug，修改报表展开数据不一致问题（不包含各页面数据统一问题），修改出入库记录信息为空bug，修改库存管理页面bug与查看详情，修改其他bug · 7952b8c4
  李小惠 committed Mar 09, 2024
  
  7952b8c4 Browse Files
08 Mar, 2024 1 commit
- Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh · 6301545b
  李小惠 committed Mar 08, 2024
  
  6301545b Browse Files