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

18 Mar, 2021 8 commits
- 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 6 commits
- 场站管理根据id查询message错误 · 8f27df25
  高晓磊 authored Mar 17, 2021
  
  8f27df25 Browse Files
- 砂石种类增删改查 · dd24da8b
  高晓磊 authored Mar 17, 2021
  
  dd24da8b Browse Files
- 出差申请审批流 · 128c0dee
  杨清松 authored Mar 17, 2021
  
  128c0dee Browse Files
- 岗位编辑完善 · 1ddf1e0c
  杨清松 authored Mar 17, 2021
  
  1ddf1e0c Browse Files
- 添加排序字段&&合并冲突解决 · 0ebeb569
  高晓磊 authored Mar 17, 2021
  
  0ebeb569 Browse Files
- 添加排序字段&&合并冲突解决 · 019ab884
  高晓磊 authored Mar 17, 2021
  
  019ab884 Browse Files
16 Mar, 2021 11 commits
- $PWF-WK01\pengwufeng's avatar$
  
  砂厂用户基础模型整套提交 · 39f84e76
  PWF-WK01\pengwufeng authored Mar 16, 2021
  
  39f84e76 Browse Files
- OA模块功能树调整 · dd4e6d8a
  shiwenbo authored Mar 16, 2021
  
  dd4e6d8a Browse Files
- 场站管理合并 · 8bc4251b
  高晓磊 authored Mar 16, 2021
  
  8bc4251b Browse Files
- Merge remote-tracking branch 'origin/feature/station' into develop · 00f05bae
```
# Conflicts:
#	backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/StationConfiguration.java
```
  高晓磊 authored Mar 16, 2021
  00f05bae Browse Files
- 尝试增加一个idea的配置 · 76ed43c8
  高晓磊 authored Mar 16, 2021
  
  76ed43c8 Browse Files
- 场站管理增删改查提交 · 9cad4c13
  高晓磊 authored Mar 16, 2021
  
  9cad4c13 Browse Files
- 更新功能树图标 · 6e7707ba
  shiwenbo authored Mar 16, 2021
  
  6e7707ba Browse Files
- 修改功能树部分功能图标 · 9f2e98d7
  shiwenbo authored Mar 16, 2021
  
  9f2e98d7 Browse Files
- 岗位管理名称重复校验 · 30623c6d
  杨清松 authored Mar 16, 2021
  
  30623c6d Browse Files
- 场站管理settings.gradle提交 · ba4171d8
  高晓磊 authored Mar 16, 2021
  
  ba4171d8 Browse Files
- 场站管理功能提交 · f9dfabae
  高晓磊 authored Mar 16, 2021
  
  f9dfabae Browse Files
15 Mar, 2021 4 commits
- 岗位管理补充 · 9629f741
  杨清松 authored Mar 15, 2021
  
  9629f741 Browse Files
- 岗位管理 · 14ccddb8
  杨清松 authored Mar 15, 2021
  
  14ccddb8 Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 6744c315
  杨清松 authored Mar 15, 2021
  
  6744c315 Browse Files
- 岗位管理,出差申请字段更改 · bf3aefdc
  杨清松 authored Mar 15, 2021
  
  bf3aefdc Browse Files
12 Mar, 2021 11 commits
- commit · 4beaef7b
  shiwenbo authored Mar 12, 2021
  
  4beaef7b Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 229a0ee5
  杨清松 authored Mar 12, 2021
  
  229a0ee5 Browse Files
- biz包增加配置 · c2afaa66
  杨清松 authored Mar 12, 2021
  
  c2afaa66 Browse Files
- Merge branch 'forIDEA' into 'develop' · 74a0819e
```
For idea

See merge request kunlun/xyst_dinas/xyst_dinas_backend!1
```
  pengwufeng authored Mar 12, 2021
  74a0819e Browse Files
- Merge branch 'develop' into 'forIDEA' · 4b89e8e9
```
# Conflicts:
#   backend/.gitignore
#   backend/common.gradle
```
  pengwufeng authored Mar 12, 2021
  4b89e8e9 Browse Files
- 合并biz包 · 5468a0e0
  高晓磊 authored Mar 12, 2021
  
  5468a0e0 Browse Files
- biz包初始化 · dd85b34f
  高晓磊 authored Mar 12, 2021
  
  dd85b34f Browse Files
- idea gitignore提交 · bc661d3b
  高晓磊 authored Mar 12, 2021
  
  bc661d3b Browse Files
- idea gitignore 提交 · d4b13f77
  高晓磊 authored Mar 12, 2021
  
  d4b13f77 Browse Files
- 基本信息biz的工程提交 · 3e197d5f
  高晓磊 authored Mar 12, 2021
  
  3e197d5f Browse Files
- Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop · 375c6c22
  杨清松 authored Mar 12, 2021
  
  375c6c22 Browse Files