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

26 Oct, 2022 9 commits
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · ccbf779a
  limei authored Oct 26, 2022
```
# Conflicts:
#	amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
```
  ccbf779a
- 添加企业注册组织机构接口 · 766517d0
  limei authored Oct 26, 2022
  
  766517d0
- Merge remote-tracking branch 'origin/developer' into developer · aabf4cb5
  dqq authored Oct 26, 2022
  
  aabf4cb5
- 安装告知删除 · ca13858b
  dqq authored Oct 26, 2022
  
  ca13858b
- 修改焊工履历列表查询接口 · e790e519
  zhangyingbin authored Oct 26, 2022
  
  e790e519
- 修改安装告知申请的新增，查看，修改 · a866e632
  dqq authored Oct 26, 2022
  
  a866e632
- 项目当前登陆的建设单位以及组织机构代码 · 661830c3
  srx authored Oct 26, 2022
  
  661830c3
- 添加模糊筛选 · 197cc39f
  wanglong authored Oct 26, 2022
  
  197cc39f
- 标准规则库小更改 · 8ef35e0e
  sxwnfpwx@163.com authored Oct 26, 2022
  
  8ef35e0e
25 Oct, 2022 20 commits
- Merge remote-tracking branch 'origin/developer' into developer · 810727cc
  sxwnfpwx@163.com authored Oct 25, 2022
  
  810727cc
- 修改部门新增/更新接口、修改删除查看接口 · 3bb89af2
  zhangyingbin authored Oct 25, 2022
  
  3bb89af2
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · 7f7daa92
  limei authored Oct 25, 2022
  
  7f7daa92
- 人员管理列表查询 · 12590b75
  limei authored Oct 25, 2022
  
  12590b75
- 修改orgUsr接口 · 2520d964
  zhangyingbin authored Oct 25, 2022
  
  2520d964
- 更新根据id删除orgUsr表数据 · 6aee4b2a
  zhangyingbin authored Oct 25, 2022
  
  6aee4b2a
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · 26d455ee
  曹盼盼 authored Oct 25, 2022
```
# Conflicts:
#	amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
#	amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
```
  26d455ee
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · ca7dc288
  limei authored Oct 25, 2022
```
# Conflicts:
#	amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/constants/XJConstant.java
#	amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
#	amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
```
  ca7dc288
- 企业注册 · 18104a35
  limei authored Oct 25, 2022
  
  18104a35
- 新增通过单位id获取单位下的所有人员列表 · b259c512
  zhangyingbin authored Oct 25, 2022
  
  b259c512
- 部门新增 · 001d0710
  曹盼盼 authored Oct 25, 2022
  
  001d0710
- 修改变更 · 45917e05
  zhangyingbin authored Oct 25, 2022
  
  45917e05
- 将新增焊工接口改为新增人员接口并创建平台用户 · f9d50579
  zhangyingbin authored Oct 25, 2022
  
  f9d50579
- 优化代码结构，优化企业审核创建企业管理员角色信息 · ef65c43e
  zhangyingbin authored Oct 25, 2022
  
  ef65c43e
- Merge remote-tracking branch 'origin/developer' into developer · c05e4d47
  sxwnfpwx@163.com authored Oct 25, 2022
  
  c05e4d47
- 修改流程修改枚举修改业务逻辑 · a10f27e1
  zhangyingbin authored Oct 25, 2022
  
  a10f27e1
- Merge remote-tracking branch 'origin/developer' into developer · 0bac851e
  sxwnfpwx@163.com authored Oct 25, 2022
  
  0bac851e
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · 82b64ea0
  zhangyingbin authored Oct 25, 2022
```
# Conflicts:
#	amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallNoticeController.java
```
  82b64ea0
- 安装告知申请分页查询修改 · 4a9f6f64
  zhangyingbin authored Oct 25, 2022
  
  4a9f6f64
- 安装告知短信筛选 · e8f0a487
  sxwnfpwx@163.com authored Oct 25, 2022
  
  e8f0a487
24 Oct, 2022 1 commit
- 安装告知页面sql修改，修改代码位置 · 82770fb4
  dqq authored Oct 24, 2022
  
  82770fb4
23 Oct, 2022 1 commit
- 项目管材页面，查看，删除 · 6e22f7de
  dqq authored Oct 23, 2022
  
  6e22f7de
21 Oct, 2022 8 commits
- 人员，设备，管材的校验，以及校验成功公共方法，校验失败的公共方法 · 24158764
  曹盼盼 authored Oct 21, 2022
  
  24158764
- 项目焊工管理详情，删除 · 9308f482
  srx authored Oct 21, 2022
  
  9308f482
- 对管材效验，添加敷设监检，焊口敷设位置标定，效验公共接口代码进行优化 · b85ed9ad
  wanglong authored Oct 21, 2022
  
  b85ed9ad
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · ecb0f47e
  wanglong authored Oct 21, 2022
  
  ecb0f47e
- 对管材效验接口，添加敷设监检接口，焊口敷设位置标定管理进行修改，添加效验公共接口 · 673d32be
  wanglong authored Oct 21, 2022
  
  673d32be
- Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · be283f92
  sxwnfpwx@163.com authored Oct 21, 2022
  
  be283f92
- 修改了一些问题 · fc6cdf80
  sxwnfpwx@163.com authored Oct 21, 2022
  
  fc6cdf80
- 修改告知分页查询 · 3a0b685f
  zhangyingbin authored Oct 21, 2022
  
  3a0b685f
20 Oct, 2022 1 commit
- 材料管理页面筛选、新增、修改、详情、删除，项目管材管理页面筛选 · 23f1d2cc
  dqq authored Oct 20, 2022
  
  23f1d2cc