Commits · ffe45f567f7431c1ac33cb4b6780881c90662362 · platform / hg-smart · GitLab

14 May, 2024 10 commits
- 2024-05-14 设备台账详情 · ffe45f56
  liuyang authored May 14, 2024
  
  ffe45f56 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 7e92ce00
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/sc/sql/HGSC002.xml
```
  liuyang authored May 14, 2024
  7e92ce00 Browse Files
- 2024-05-14 设备台账详情 · 321ac87f
  liuyang authored May 14, 2024
  
  321ac87f Browse Files
- 1.生产领料 · b8c068e8
  宋祥 authored May 14, 2024
  
  b8c068e8 Browse Files
- 项目人员-附件详情dev； · 5dd83e45
  wuwenlong authored May 14, 2024
  
  5dd83e45 Browse Files
- 项目人员-附件详情dev； · c880522f
  wuwenlong authored May 14, 2024
  
  c880522f Browse Files
- 1.语法错误修正 · 7ad122db
  宋祥 authored May 14, 2024
  
  7ad122db Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · a818f806
  liuyang authored May 14, 2024
  
  a818f806 Browse Files
- 2024-05-14 库存 · d3aa2e40
  liuyang authored May 14, 2024
  
  d3aa2e40 Browse Files
- 配置管理更新 · a7cb6df0
  wancheng authored May 14, 2024
  
  a7cb6df0 Browse Files
13 May, 2024 12 commits
- 项目人员dev； · 49f5f711
  wuwenlong authored May 13, 2024
  
  49f5f711 Browse Files
- 项目人员dev； · 601ea124
  wuwenlong authored May 13, 2024
  
  601ea124 Browse Files
- 项目人员dev； · 9fe21d84
  wuwenlong authored May 13, 2024
  
  9fe21d84 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 66df8c73
  wuwenlong authored May 13, 2024
  
  66df8c73 Browse Files
- 项目人员dev； · 336d0c9a
  wuwenlong authored May 13, 2024
  
  336d0c9a Browse Files
- 2024-05-11 设备保养 · aedb2b81
  liuyang authored May 13, 2024
  
  aedb2b81 Browse Files
- 2024-05-11 设备点检 · d9ecb9c7
  liuyang authored May 13, 2024
  
  d9ecb9c7 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 1b482d6a
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/constant/HGConstant.java
```
  liuyang authored May 13, 2024
  1b482d6a Browse Files
- 2024-05-11 优化设备管理查询条件显示优化 · d6a5ed38
  liuyang authored May 13, 2024
  
  d6a5ed38 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 62c2f016
  宋祥 authored May 13, 2024
  
  62c2f016 Browse Files
- 1.采购入库，综合库存管理 · e94ef759
  宋祥 authored May 13, 2024
  
  e94ef759 Browse Files
- 项目立项修改BUGFIX； · 1840d291
  wuwenlong authored May 13, 2024
  
  1840d291 Browse Files
11 May, 2024 18 commits
- 项目立项修改BUGFIX； · 381f81ae
  wuwenlong authored May 11, 2024
  
  381f81ae Browse Files
- 项目立项修改BUGFIX； · 06c0d0b3
  wuwenlong authored May 11, 2024
  
  06c0d0b3 Browse Files
- 项目立项修改BUGFIX； · e7ae2777
  wuwenlong authored May 11, 2024
  
  e7ae2777 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 56257c6d
  wuwenlong authored May 11, 2024
  
  56257c6d Browse Files
- 项目立项修改BUGFIX； · 8a798188
  wuwenlong authored May 11, 2024
  
  8a798188 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 18f496ee
  宋祥 authored May 11, 2024
  
  18f496ee Browse Files
- 1.增加存货类型，宽度，重量等字段 · 4203a385
  宋祥 authored May 11, 2024
  
  4203a385 Browse Files
- 项目立项修改BUGFIX； · 94edd169
  wuwenlong authored May 11, 2024
  
  94edd169 Browse Files
- 项目立项修改BUGFIX； · 4094e541
  wuwenlong authored May 11, 2024
  
  4094e541 Browse Files
- 项目立项修改BUGFIX； · bd77b46a
  wuwenlong authored May 11, 2024
  
  bd77b46a Browse Files
- 项目立项修改BUGFIX； · 942399c4
  wuwenlong authored May 11, 2024
  
  942399c4 Browse Files
- 项目立项修改BUGFIX； · bd680e46
  wuwenlong authored May 11, 2024
  
  bd680e46 Browse Files
- 项目立项修改BUGFIX； · 49a395a5
  wuwenlong authored May 11, 2024
  
  49a395a5 Browse Files
- 项目立项修改BUGFIX； · 7a21ed77
  wuwenlong authored May 11, 2024
  
  7a21ed77 Browse Files
- 项目立项提交、完工dev； · fda66056
  wuwenlong authored May 11, 2024
  
  fda66056 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · dfee68d2
  wuwenlong authored May 11, 2024
  
  dfee68d2 Browse Files
- 项目立项提交、完工dev； · 2c66ff4a
  wuwenlong authored May 11, 2024
  
  2c66ff4a Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d627b56b
```
# Conflicts:
#	src/main/java/com/baosight/hggp/common/DdynamicEnum.java
#	src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005.xml
```
  宋祥 authored May 11, 2024
  d627b56b Browse Files