Commits · d627b56bd75b967681b7a887363f6faa6975b916 · platform / hg-smart · GitLab

11 May, 2024 9 commits
- 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
- 1.增加存货名称和规格选项 · 399da434
  宋祥 authored May 11, 2024
  
  399da434 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 58b70e01
  liuyang authored May 11, 2024
  
  58b70e01 Browse Files
- 2024-05-11 优化设备计划人、设备负责人、维修申请人默认选中登录用户 · 92d704a0
  liuyang authored May 11, 2024
  
  92d704a0 Browse Files
- 配置管理更新 · 969b258f
  wancheng authored May 11, 2024
  
  969b258f Browse Files
- 配置管理更新 · 643184de
  wancheng authored May 11, 2024
  
  643184de Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 8a2d7a2e
  宋祥 authored May 11, 2024
  
  8a2d7a2e Browse Files
- 1.数据权限调整优化 · 1238e013
  宋祥 authored May 11, 2024
  
  1238e013 Browse Files
- 2024-05-11 优化工序设置多公司无法重复添加并且可以多公司使用， · 08d97908
```
工序单价导入解析去空格
```
  liuyang authored May 11, 2024
  08d97908 Browse Files
10 May, 2024 12 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · bb091811
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/constant/HGConstant.java
```
  liuyang authored May 10, 2024
  bb091811 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 2a40d612
  宋祥 authored May 10, 2024
  
  2a40d612 Browse Files
- 1.采购合同、采购收货 · bfe647e6
  宋祥 authored May 10, 2024
  
  bfe647e6 Browse Files
- 2024-05-09 设备维护申请 · 169509b2
  liuyang authored May 10, 2024
  
  169509b2 Browse Files
- 2024-05-09 优化设备台账、设备计划 · 89afb077
  liuyang authored May 10, 2024
  
  89afb077 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · b8dbb324
  yukang authored May 10, 2024
  
  b8dbb324 Browse Files
- 账期维护，合同管理 · 6378a4bb
  yukang authored May 10, 2024
  
  6378a4bb Browse Files
- 配置管理更新 · ea4959bd
  wancheng authored May 10, 2024
  
  ea4959bd Browse Files
- 项目立项dev； · 79ec23d8
  wuwenlong authored May 10, 2024
  
  79ec23d8 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 80ef1525
  liuyang authored May 10, 2024
  
  80ef1525 Browse Files
- 2024-05-09 设备计划 · 6a702e44
  liuyang authored May 10, 2024
  
  6a702e44 Browse Files
- 1.采购计划 · ea99567f
  宋祥 authored May 10, 2024
  
  ea99567f Browse Files
09 May, 2024 19 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 28720284
  liuyang authored May 09, 2024
  
  28720284 Browse Files
- 2024-05-09 设备台账 · 56c6635b
  liuyang authored May 09, 2024
  
  56c6635b Browse Files
- 2024-05-09 工序单价优化 · 654d0888
  liuyang authored May 09, 2024
  
  654d0888 Browse Files
- 2024-05-09 设备台账 · f2148a0d
  liuyang authored May 09, 2024
  
  f2148a0d Browse Files
- 配置管理更新 · e7be94f6
  wancheng authored May 09, 2024
  
  e7be94f6 Browse Files
- 1.DEPT名称错误 · f625adf0
  宋祥 authored May 09, 2024
  
  f625adf0 Browse Files
- 1.sql名称错误 · a792a45e
  宋祥 authored May 09, 2024
  
  a792a45e Browse Files
- 1.sql名称错误 · d2c741ee
  宋祥 authored May 09, 2024
  
  d2c741ee Browse Files
- 1.user增加部门信息 · 2fb06e8c
  宋祥 authored May 09, 2024
  
  2fb06e8c Browse Files
- 1.返回空对象 · 850bab91
  宋祥 authored May 09, 2024
  
  850bab91 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · c0fe2b26
  宋祥 authored May 09, 2024
  
  c0fe2b26 Browse Files
- 1.用户信息4J规范 · 5c6d864e
  宋祥 authored May 09, 2024
  
  5c6d864e Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 8093bed5
  liuyang authored May 09, 2024
  
  8093bed5 Browse Files
- 2024-05-08 优化工序单价 · 021cee7a
  liuyang authored May 09, 2024
  
  021cee7a Browse Files
- 1.dept 默认值 · f4a3516d
  宋祥 authored May 09, 2024
  
  f4a3516d Browse Files
- 1.dept 默认值 · 421742a5
  宋祥 authored May 09, 2024
  
  421742a5 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 848d4bce
  宋祥 authored May 09, 2024
  
  848d4bce Browse Files
- 1.dept 默认值 · f921bd7b
  宋祥 authored May 09, 2024
  
  f921bd7b Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · db134027
  wancheng authored May 09, 2024
  
  db134027 Browse Files