Commits · 4f55def92a12ff9e2010431a7b4448d15b4dfaa4 · 项目统一框架 / amos-boot-biz

28 Feb, 2025 11 commits
- fix(jg):代码找回 · 4f55def9
  Lambertliu authored Feb 28, 2025
  
  4f55def9
- fix(jg):工业管道详情返回单位类型 · 956e5822
  Lambertliu authored Feb 28, 2025
  
  956e5822
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 887017f1
  Lambertliu authored Feb 28, 2025
  
  887017f1
- fix(jg):设备移交筛选装置 · ddd0caa1
  韩桐桐 authored Feb 28, 2025
  
  ddd0caa1
- fix(jg):新增设备发起页工业管道修改 · 0b5eb36c
  Lambertliu authored Feb 28, 2025
  
  0b5eb36c
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 63f449f0
  chenzhao authored Feb 28, 2025
  
  63f449f0
- 历史无证增补增加筛选 · c08029bd
  chenzhao authored Feb 28, 2025
  
  c08029bd
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 39519b19
  hezhuozhi authored Feb 28, 2025
  
  39519b19
- 【需求】管道变更/单位变更 · 8158d7a7
  hezhuozhi authored Feb 28, 2025
  
  8158d7a7
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · b06165ee
  Lambertliu authored Feb 28, 2025
  
  b06165ee
- fix(jg):新增设备发起页工业管道修改 · 53a1014c
  Lambertliu authored Feb 28, 2025
  
  53a1014c
27 Feb, 2025 27 commits
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · d64ef1c8
  hezhuozhi authored Feb 27, 2025
  
  d64ef1c8
- 【需求】管道变更/单位变更 · 11cbd3b7
  hezhuozhi authored Feb 27, 2025
  
  11cbd3b7
- Merge branch 'develop_tzs_register' of… · 8bad3e42
  suhuiguang authored Feb 27, 2025
```
Merge branch 'develop_tzs_register' of http://39.100.92.250:5000/moa/amos-boot-biz into develop_tzs_register
```
  8bad3e42
- Merge branch 'develop_tzs_bugfix' into develop_tzs_register · dd742092
  suhuiguang authored Feb 27, 2025
  
  dd742092
- 1.设备已纳管过滤属地监管部门列表过滤问题 · 9ee2ba82
  suhuiguang authored Feb 27, 2025
  
  9ee2ba82
- 【需求】管道变更/单位变更 · 0b1dc212
  hezhuozhi authored Feb 27, 2025
  
  0b1dc212
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 1342710c
  hezhuozhi authored Feb 27, 2025
  
  1342710c
- 【需求】管道变更/单位变更 · a261f206
  hezhuozhi authored Feb 27, 2025
  
  a261f206
- Merge branch 'develop_tzs_bugfix' into develop_tzs_register · a1adcaef
  suhuiguang authored Feb 27, 2025
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
```
  a1adcaef
- 1.管辖机构树：按照当前登录人单位类型返回管辖机构树，公司类型人员返回全部树。监管机构返回当前登录人机构及一下（只考虑非审批机构使用） · ff8b79a4
  suhuiguang authored Feb 27, 2025
  
  ff8b79a4
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · f7891fc5
  Lambertliu authored Feb 27, 2025
  
  f7891fc5
- fix(jg):使用登记检验信息bug修改 · 5054b9e6
  Lambertliu authored Feb 27, 2025
  
  5054b9e6
- Merge branch 'develop_tzs_register_test' into develop_tzs_bugfix · b882406d
  suhuiguang authored Feb 27, 2025
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
```
  b882406d
- Merge branch 'develop_tzs_bugfix' into develop_tzs_register · c198fe2c
  suhuiguang authored Feb 27, 2025
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
```
  c198fe2c
- Merge branch 'develop_tzs_bugfix' into develop_tzs_register · d77df820
  suhuiguang authored Feb 27, 2025
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java
```
  d77df820
- Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register · 2849528f
  hezhuozhi authored Feb 27, 2025
  
  2849528f
- 【需求】管道变更/单位变更 · 941d7052
  hezhuozhi authored Feb 27, 2025
  
  941d7052
- Merge branch 'develop_tzs_register_test' into develop_tzs_register · 469ff0f2
  suhuiguang authored Feb 27, 2025
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
```
  469ff0f2
- 1.使用登记、安装告知属地监管部门列表过滤问题 · 92e355d9
  suhuiguang authored Feb 27, 2025
  
  92e355d9
- 1.车用气瓶过滤监管机构bug · 3d2e21ab
  suhuiguang authored Feb 27, 2025
  
  3d2e21ab
- Merge branch 'develop_tzs_register' of… · 70ca437f
  suhuiguang authored Feb 27, 2025
```
Merge branch 'develop_tzs_register' of http://39.100.92.250:5000/moa/amos-boot-biz into develop_tzs_register
```
  70ca437f
- Merge branch 'develop_tzs_register_test' into develop_tzs_register · 997b0ab5
  suhuiguang authored Feb 27, 2025
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingGenServiceImpl.java
```
  997b0ab5
- Merge branch 'develop_tzs_register_test' into develop_tzs_register · 30fcc9be
  suhuiguang authored Feb 27, 2025
```
# Conflicts:
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
#	amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingGenServiceImpl.java
```
  30fcc9be
- 1.车用气瓶过滤监管机构bug · 9f5ebd45
  suhuiguang authored Feb 27, 2025
  
  9f5ebd45
- 【需求】管道变更/单位变更 · 438bb612
  hezhuozhi authored Feb 27, 2025
  
  438bb612
- 修改使用登记表单位名称错误 · 8c629e76
  chenzhao authored Feb 27, 2025
  
  8c629e76
- 【需求】管道变更/单位变更 · 219e4923
  hezhuozhi authored Feb 27, 2025
  
  219e4923
26 Feb, 2025 2 commits
- Merge remote-tracking branch 'origin/develop_tzs_register_test' into develop_tzs_register_test · 74ae1035
  hezhuozhi authored Feb 26, 2025
  
  74ae1035
- 使用登记表气瓶投入使用时间 · 3d450102
  hezhuozhi authored Feb 26, 2025
  
  3d450102