Commits · c404a27ca72a5e503124af706842fa2c4e0a2ed5 · yangxiujun / paidan_demo

10 Aug, 2023 18 commits
- Merge branch 'dev_mp2jpa0810' into 'develop' · c404a27c
```
删除

See merge request !330
```
  王力 committed Aug 10, 2023
  c404a27c Browse Files
- 删除 · a577d8c6
  wangli committed Aug 10, 2023
  
  a577d8c6 Browse Files
- Merge branch 'dev_mp2jpa0809' into 'develop' · 346d8cf4
```
Dev mp2jpa0809

See merge request !329
```
  王力 committed Aug 10, 2023
  346d8cf4 Browse Files
- mp2jpa清理不需要的entity和dao · 03e5ea41
  wangli committed Aug 10, 2023
  
  03e5ea41 Browse Files
- 修改 · fac3021f
  wangli committed Aug 10, 2023
  
  fac3021f Browse Files
- Merge branch 'dev_mp2jpa0809' into 'develop' · d21e84fe
```
Dev mp2jpa0809

See merge request !328
```
  王力 committed Aug 10, 2023
  d21e84fe Browse Files
- 修改 · 86ccc9d8
  wangli committed Aug 10, 2023
  
  86ccc9d8 Browse Files
- 修改 · 9510a715
  wangli committed Aug 10, 2023
  
  9510a715 Browse Files
- Merge branch 'dev_mp2jpa0809' into 'develop' · 82c5d2d0
```
Dev mp2jpa0809

See merge request !327
```
  王力 committed Aug 10, 2023
  82c5d2d0 Browse Files
- 修改 · 06b95e5c
  wangli committed Aug 10, 2023
  
  06b95e5c Browse Files
- 新增 · cc38a216
  wangli committed Aug 10, 2023
  
  cc38a216 Browse Files
- Merge branch 'dev_mp2jpa0809' into 'develop' · 4629090e
```
Dev mp2jpa0809

See merge request !326
```
  王力 committed Aug 10, 2023
  4629090e Browse Files
- 修改 · 6a51be14
  wangli committed Aug 10, 2023
  
  6a51be14 Browse Files
- 修改 · 2c8a9f36
  wangli committed Aug 10, 2023
  
  2c8a9f36 Browse Files
- mp2jpa · f87ac4c7
  wangli committed Aug 10, 2023
  
  f87ac4c7 Browse Files
- mp2jpa · 9a09a738
  wangli committed Aug 10, 2023
  
  9a09a738 Browse Files
- 修改 · af192a80
  wangli committed Aug 10, 2023
  
  af192a80 Browse Files
- mp2jpa · a1217c7b
  wangli committed Aug 10, 2023
  
  a1217c7b
09 Aug, 2023 7 commits
- Merge branch 'dev_mp2jpa0809' into 'develop' · 49edbc50
```
Dev mp2jpa0809

See merge request !325
```
  王力 committed Aug 09, 2023
  49edbc50 Browse Files
- 修改 · aa4c0747
  wangli committed Aug 09, 2023
  
  aa4c0747 Browse Files
- 修改 · f6e0b73c
  wangli committed Aug 09, 2023
  
  f6e0b73c Browse Files
- 修改 · f63fd4fd
  wangli committed Aug 09, 2023
  
  f63fd4fd Browse Files
- mp2jpa · 9203cb82
  wangli committed Aug 09, 2023
  
  9203cb82 Browse Files
- 修改 · 413634a1
  wangli committed Aug 09, 2023
  
  413634a1 Browse Files
- Merge branch 'dev_mp2jpa0803' into 'develop' · cfc5e307
```
Dev mp2jpa0803

See merge request !324
```
  王力 committed Aug 09, 2023
  cfc5e307 Browse Files
07 Aug, 2023 4 commits
- 用户登录、信息方面，移除了以前写死的逻辑，对接了user微服务 · ce9530f3
  丁伟峰 committed Aug 07, 2023
  
  ce9530f3 Browse Files
- 配件仓不需要翻页，查询一次性返回 · 055497a7
  丁伟峰 committed Aug 07, 2023
  
  055497a7 Browse Files
- 返回字段信息补充 · 0e1263d8
  丁伟峰 committed Aug 07, 2023
  
  0e1263d8 Browse Files
- 按组织级别分页查询返回配件仓信息 · 8269ab8a
  丁伟峰 committed Aug 07, 2023
  
  8269ab8a
06 Aug, 2023 2 commits
- workday直接是字符串方式进行处理 · c1317e0a
  丁伟峰 committed Aug 06, 2023
  
  c1317e0a Browse Files
- 请求报文字段验证 · 0bf9bce8
  丁伟峰 committed Aug 06, 2023
  
  0bf9bce8 Browse Files
05 Aug, 2023 7 commits
- 日历设置多技术员多日删除功能 · 31b57e23
  丁伟峰 committed Aug 05, 2023
  
  31b57e23 Browse Files
- fix: snowflake序号后10位 · 3973410a
  丁伟峰 committed Aug 05, 2023
  
  3973410a Browse Files
- fix: snowflake序号后10位 · 20945cf3
  丁伟峰 committed Aug 05, 2023
  
  20945cf3 Browse Files
- 返回应答报文 · bb6700e3
  丁伟峰 committed Aug 05, 2023
  
  bb6700e3 Browse Files
- for test · ff3bad86
  丁伟峰 committed Aug 05, 2023
  
  ff3bad86 Browse Files
- Merge branch 'feat-calender' into develop · fd684dde
```
# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
```
  丁伟峰 committed Aug 05, 2023
  fd684dde Browse Files
- 前端传递的是英文值；后端予以修改 · 938e9ace
  丁伟峰 committed Aug 05, 2023
  
  938e9ace Browse Files
04 Aug, 2023 2 commits
- 增加了当前操作员信息 · b2f627ba
  丁伟峰 committed Aug 05, 2023
  
  b2f627ba Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 0078c988
  丁伟峰 committed Aug 04, 2023
  
  0078c988 Browse Files