Commits · b90162f93899408b2e5b92e80a4761952ac899a3 · 王衍超 / cloud-fb · GitLab

24 Mar, 2021 7 commits
- query的id修改,重复了 · b90162f9
  高晓磊 authored Mar 24, 2021
  
  b90162f9 Browse Files
- 添加rootProject.name · c10fbece
  高晓磊 authored Mar 24, 2021
  
  c10fbece Browse Files
- 摄像头修改requestMapping · 3b26a921
  高晓磊 authored Mar 24, 2021
  
  3b26a921 Browse Files
- Merge remote-tracking branch 'origin/feature/biz_ship' into develop · cda05aa2
```
# Conflicts:
#	backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/CameraInfoController.java
```
  高晓磊 authored Mar 24, 2021
  cda05aa2 Browse Files
- 船舶管理增删改查 · 753110bd
  高晓磊 authored Mar 24, 2021
  
  753110bd Browse Files
- 修改功能入口定义 · 86ec6c1b
  shiwenbo authored Mar 24, 2021
  
  86ec6c1b Browse Files
- 区域公司查询元数据 · 1254d15b
  杨清松 authored Mar 24, 2021
  
  1254d15b Browse Files
23 Mar, 2021 9 commits
- 调整单位备案的功能位置 · 846d72c6
  shiwenbo authored Mar 23, 2021
  
  846d72c6 Browse Files
- $PWF-WK01\pengwufeng's avatar$
  
  砂厂用户登录调整 · a8e71ad4
  PWF-WK01\pengwufeng authored Mar 23, 2021
  
  a8e71ad4 Browse Files
- 名称校验,新增时不需要传id · cf71e17c
  高晓磊 authored Mar 23, 2021
  
  cf71e17c Browse Files
- 修改功能树，增加集团的项目、单位和合同的清单查询功能 · 62e1aff6
  shiwenbo authored Mar 23, 2021
  
  62e1aff6 Browse Files
- 项目备案加区域公司 · 80bbd07b
  杨清松 authored Mar 23, 2021
  
  80bbd07b Browse Files
- 项目备案数据模型 · 355872bc
  杨清松 authored Mar 23, 2021
  
  355872bc Browse Files
- Merge branch 'feature/biz_camera' into develop · a80db428
  高晓磊 authored Mar 23, 2021
  
  a80db428 Browse Files
- 摄像头管理增删改查提交 · 28295f83
  高晓磊 authored Mar 23, 2021
  
  28295f83 Browse Files
- 组织机构管理 · b12a26d5
  杨清松 authored Mar 23, 2021
  
  b12a26d5 Browse Files
22 Mar, 2021 6 commits
- 修改场站用户登出接口 · a3531db3
  焦凯 authored Mar 22, 2021
  
  a3531db3 Browse Files
- 修改获取场站功能树的地址 · dd58c0ae
  焦凯 authored Mar 22, 2021
  
  dd58c0ae Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 788239dd
  焦凯 authored Mar 22, 2021
  
  788239dd Browse Files
- 修改场站用户登录状态接口地址 · 74c94227
  焦凯 authored Mar 22, 2021
  
  74c94227 Browse Files
- 岗位管理位置调整 · b1b0cfc0
  shiwenbo authored Mar 22, 2021
  
  b1b0cfc0 Browse Files
- 场站用户账号手机号重复校验 · efba1137
  杨清松 authored Mar 22, 2021
  
  efba1137 Browse Files
19 Mar, 2021 18 commits
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 55d3f413
  杨清松 authored Mar 19, 2021
  
  55d3f413 Browse Files
- 场站用户相关接口 · 5c3968ee
  杨清松 authored Mar 19, 2021
  
  5c3968ee Browse Files
- 查询中间表时带上了库的名称 · 09182d8f
  高晓磊 authored Mar 19, 2021
  
  09182d8f Browse Files
- $PWF-WK01\pengwufeng's avatar$
  
  修复砂厂用户登录返回姓名乱码的问题 · 9fc433d0
  PWF-WK01\pengwufeng authored Mar 19, 2021
  
  9fc433d0 Browse Files
- 修改采砂用户功能; · ec9e8b47
  王衍超 authored Mar 19, 2021
  
  ec9e8b47 Browse Files
- 添加砂石种类节点 · f03a3456
  焦凯 authored Mar 19, 2021
  
  f03a3456 Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 13147498
  焦凯 authored Mar 19, 2021
  
  13147498 Browse Files
- 区域公司相关接口修改 · 049079dc
  焦凯 authored Mar 19, 2021
  
  049079dc Browse Files
- $PWF-WK01\pengwufeng's avatar$
  
  调整场站用户专用接口url · 3e6485fd
  PWF-WK01\pengwufeng authored Mar 19, 2021
  
  3e6485fd Browse Files
- 修改时将del设为true的问题 · e7a1fb57
  高晓磊 authored Mar 19, 2021
  
  e7a1fb57 Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · b97783f1
```
# Conflicts:
#	backend/inz.basis/src/main/java/com/beecode/inz/basis/web/WarehouseUserController.java
```
  焦凯 authored Mar 19, 2021
  b97783f1 Browse Files
- 修改功能树等接口 · 9a05c7e5
  焦凯 authored Mar 19, 2021
  
  9a05c7e5 Browse Files
- $PWF-WK01\pengwufeng's avatar$
  
  砂厂用户登出以及创建用户url调整 · 469e247a
  PWF-WK01\pengwufeng authored Mar 19, 2021
  
  469e247a Browse Files
- 解决冲突 · 5da02a78
  王衍超 authored Mar 19, 2021
  
  5da02a78 Browse Files
- 增加采砂用户体系; · f27ceb4b
  王衍超 authored Mar 19, 2021
  
  f27ceb4b Browse Files
- Merge branch 'feature/dinas_type' into develop · e1eeb4e1
  高晓磊 authored Mar 19, 2021
  
  e1eeb4e1 Browse Files
- 砂石种类没有加外层resp · 7ec8e850
  高晓磊 authored Mar 19, 2021
  
  7ec8e850 Browse Files
- $PWF-WK01\pengwufeng's avatar$
  
  场站用户登录返回用户title，用户模型关联场站id · 2f7d39af
  PWF-WK01\pengwufeng authored Mar 19, 2021
  
  2f7d39af Browse Files