Commits · f495281b4ac35e43ad500db17fb1d23d6762a9f4 · yangxiujun / paidan_demo · GitLab

12 Jul, 2023 25 commits
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · f495281b
```
…oject.git into develop
```
  chamberone committed Jul 12, 2023
  f495281b Browse Files
- feat: 用户添加权限资源模块 · 21e01e9f
  chamberone committed Jul 12, 2023
  
  21e01e9f
- Merge branch 'dev_dispatch_filter0711' into 'develop' · feef76f3
```
修改接口&筛选逻辑实现

See merge request !206
```
  王力 committed Jul 12, 2023
  feef76f3 Browse Files
- 修改接口&筛选逻辑实现 · 7c7a9683
  wangli committed Jul 12, 2023
  
  7c7a9683 Browse Files
- Merge branch 'dev_dispatch_filter0711' into 'develop' · 25be2ca1
```
修改

See merge request !205
```
  王力 committed Jul 12, 2023
  25be2ca1 Browse Files
- 修改 · 10c7a99f
  wangli committed Jul 12, 2023
  
  10c7a99f Browse Files
- Merge branch 'dev_dispatch_filter0711' into 'develop' · 434ab7b9
```
Dev dispatch filter0711

See merge request !204
```
  王力 committed Jul 12, 2023
  434ab7b9 Browse Files
- 修改筛选查询 · 02f0db4b
  wangli committed Jul 12, 2023
  
  02f0db4b Browse Files
- 修改接口参数“” · 440ff3f2
  wangli committed Jul 12, 2023
  
  440ff3f2 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · 8713b158
```
…oject.git into develop
```
  chamberone committed Jul 12, 2023
  8713b158 Browse Files
- feat: 添加角色信息 · 055bc15b
  chamberone committed Jul 12, 2023
  
  055bc15b Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 601ac13a
  丁伟峰 committed Jul 12, 2023
  
  601ac13a Browse Files
- 修订jpa接口 · 528a3fe4
  丁伟峰 committed Jul 12, 2023
  
  528a3fe4 Browse Files
- 合并后残余清理 · f7427bee
  丁伟峰 committed Jul 12, 2023
  
  f7427bee Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 3da0bfae
```
# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
```
  丁伟峰 committed Jul 12, 2023
  3da0bfae Browse Files
- 基础性的技能树列表返回，用于创建订单时候的条件选择 · bbf7f4a2
  丁伟峰 committed Jul 12, 2023
  
  bbf7f4a2 Browse Files
- Merge branch 'dev_dispatch_filter0711' into 'develop' · 0d7215d7
```
Dev dispatch filter0711

See merge request !203
```
  王力 committed Jul 12, 2023
  0d7215d7 Browse Files
- 修改 · 6e4b5239
  wangli committed Jul 12, 2023
  
  6e4b5239 Browse Files
- 新增方法 · c3888f0c
  wangli committed Jul 12, 2023
  
  c3888f0c Browse Files
- feat: 更新user模块url前缀 · 5365be9a
  chamberone committed Jul 12, 2023
  
  5365be9a Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · 2fb85b77
```
…oject.git into develop
```
  chamberone committed Jul 12, 2023
  2fb85b77 Browse Files
- feat: 鉴权方式更新 · 0ded5f26
  chamberone committed Jul 12, 2023
  
  0ded5f26 Browse Files
- 去掉日志 · ed500a8c
  wangli committed Jul 12, 2023
  
  ed500a8c Browse Files
- Merge branch 'dev_dispatch_filter0711' into 'develop' · 722254c0
```
修改

See merge request !202
```
  王力 committed Jul 12, 2023
  722254c0 Browse Files
- 修改 · 143aa822
  wangli committed Jul 12, 2023
  
  143aa822 Browse Files
11 Jul, 2023 15 commits
- Merge branch 'dev_dispatch_filter0711' into 'develop' · 94a4c54a
```
Dev dispatch filter0711

See merge request !201
```
  王力 committed Jul 11, 2023
  94a4c54a Browse Files
- 新增筛选项 · 7328d21b
  wangli committed Jul 11, 2023
  
  7328d21b Browse Files
- 新增接口请求参数DTO · b8220646
  wangli committed Jul 11, 2023
  
  b8220646 Browse Files
- Merge branch 'dev_rescheduling20230711' into 'develop' · 0991c619
```
算法优化

See merge request !200
```
  王力 committed Jul 11, 2023
  0991c619 Browse Files
- 将原先的创建订单查询容量，与各个机构/工作队的容量统计展示，剥离到不同的模块 · 9a762940
  丁伟峰 committed Jul 11, 2023
  
  9a762940 Browse Files
- 根据数据表生成entity · 5897512c
  丁伟峰 committed Jul 11, 2023
  
  5897512c Browse Files
- 算法优化 · 1f25fd63
  wangli committed Jul 11, 2023
  
  1f25fd63 Browse Files
- fix: fix null error · 5bcdc36a
  chamberone committed Jul 11, 2023
  
  5bcdc36a Browse Files
- fix: fix param error · 8471d110
  chamberone committed Jul 11, 2023
  
  8471d110
- fix: fix error · 5ece0bb1
  chamberone committed Jul 11, 2023
  
  5ece0bb1 Browse Files
- feat: add logs · 1ccc1cb7
  chamberone committed Jul 11, 2023
  
  1ccc1cb7 Browse Files
- feat: 登录接口更新 · befb7829
  chamberone committed Jul 11, 2023
  
  befb7829 Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · 2896b157
```
…oject.git into develop
```
  chamberone committed Jul 11, 2023
  2896b157 Browse Files
- feat: 添加用户登录和获取用户接口 · 5ae97a31
  chamberone committed Jul 11, 2023
  
  5ae97a31 Browse Files
- Merge branch 'dev_rescheduling20230711' into 'develop' · c679fb62
```
修改

See merge request !199
```
  王力 committed Jul 11, 2023
  c679fb62 Browse Files