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

22 Mar, 2021 5 commits
- 修改获取场站功能树的地址 · 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
18 Mar, 2021 16 commits
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 136b1208
  shiwenbo authored Mar 18, 2021
  
  136b1208 Browse Files
- 调整功能树，区域公司管理改为组织机构管理 · aba5e1b0
  shiwenbo authored Mar 18, 2021
  
  aba5e1b0 Browse Files
- Merge branch 'feature/dinas_type' into develop · f8f0c93f
  高晓磊 authored Mar 18, 2021
  
  f8f0c93f Browse Files
- 场站管理去掉砂石种类的集合,避免循环调用的情况 · ae9021c2
  高晓磊 authored Mar 18, 2021
  
  ae9021c2 Browse Files
- 修改功能树，拆分绩效考核功能 · e8c61f88
  shiwenbo authored Mar 18, 2021
  
  e8c61f88 Browse Files
- 修改角色名称的校验方式 · cdd1d927
  shiwenbo authored Mar 18, 2021
  
  cdd1d927 Browse Files
- 调整功能树，增加业务管理节点 · f1b9270f
  shiwenbo authored Mar 18, 2021
  
  f1b9270f Browse Files
- 拟文数据模型 · 73497029
  杨清松 authored Mar 18, 2021
  
  73497029 Browse Files
- Merge remote-tracking branch 'origin/feature/dinas_type' into develop · be64b124
  高晓磊 authored Mar 18, 2021
  
  be64b124 Browse Files
- 砂石类型管理功能提交 · 59366644
  高晓磊 authored Mar 18, 2021
  
  59366644 Browse Files
- 多功能能力：基础 · c8de78c9
  焦凯 authored Mar 18, 2021
  
  c8de78c9 Browse Files
- $PWF-WK01\pengwufeng's avatar$
  
  权限控制 · 8b0a2a92
  PWF-WK01\pengwufeng authored Mar 18, 2021
  
  8b0a2a92 Browse Files
- 修改冲突问题 · 97771037
  焦凯 authored Mar 18, 2021
  
  97771037 Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 561106d1
```
# Conflicts:
#	backend/inz.basis/src/main/resources/META-INF/spring.factories
```
  焦凯 authored Mar 18, 2021
  561106d1 Browse Files
- 提交代码 · 356e9721
  焦凯 authored Mar 18, 2021
  
  356e9721 Browse Files
- $PWF-WK01\pengwufeng's avatar$
  
  场站用户登录 · 028c9c76
  PWF-WK01\pengwufeng authored Mar 18, 2021
  
  028c9c76 Browse Files
17 Mar, 2021 1 commit
- 场站管理根据id查询message错误 · 8f27df25
  高晓磊 authored Mar 17, 2021
  
  8f27df25 Browse Files