Commits · ae9595debd07d5a0268ff28c57e9cad9a928a3dc · fangxinjiang / yifu-mvp

09 Sep, 2022 5 commits
- Merge branch 'feature-licancan' into 'develop' · ae9595de
  李灿灿 authored Sep 09, 2022
```
sonar 坏味道 能改的问题处理

See merge request fangxinjiang/yifu!246
```
  ae9595de
- sonar 坏味道能改的问题处理 · fe6222d8
  李灿灿 authored Sep 09, 2022
  
  fe6222d8
- 优化收入 · 8bd8ec97
  hongguangwu authored Sep 09, 2022
  
  8bd8ec97
- Merge remote-tracking branch 'origin/develop' into develop · 77e67a0b
  hongguangwu authored Sep 09, 2022
  
  77e67a0b
- 优化收入 · 5f132f49
  hongguangwu authored Sep 09, 2022
  
  5f132f49
08 Sep, 2022 10 commits
- 生成收入接口修改 · 242a25da
  huyuchen authored Sep 08, 2022
  
  242a25da
- Merge remote-tracking branch 'origin/develop' into develop · 8fcd515a
  fangxinjiang authored Sep 08, 2022
  
  8fcd515a
- 导出收入优化 · de3eddb5
  fangxinjiang authored Sep 08, 2022
  
  de3eddb5
- 优化收入 · 58c65685
  hongguangwu authored Sep 08, 2022
  
  58c65685
- 优化收入 · b7649dac
  hongguangwu authored Sep 08, 2022
  
  b7649dac
- 字段迁移到项目表 · ee5df90e
  hongguangwu authored Sep 08, 2022
  
  ee5df90e
- Merge remote-tracking branch 'origin/develop' into develop · a1758433
  hongguangwu authored Sep 08, 2022
```
# Conflicts:
#	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
```
  a1758433
- 派单不同月份的社保公积金预估明细优化； · 11785e0f
  hongguangwu authored Sep 08, 2022
  
  11785e0f
- 生成收入接口修改 · 0cd180d0
  huyuchen authored Sep 08, 2022
  
  0cd180d0
- 生成收入接口修改 · b90ddfe9
  huyuchen authored Sep 08, 2022
  
  b90ddfe9
07 Sep, 2022 25 commits
- Merge branch 'feature-zhaji' into 'develop' · 813c5563
  查济 authored Sep 07, 2022
```
Feature zhaji

See merge request fangxinjiang/yifu!245
```
  813c5563
- Merge branch 'develop' into feature-zhaji · 0afe9a3c
  zhaji authored Sep 07, 2022
  
  0afe9a3c
- "feature-zhaJi:修改商险重发部分逻辑" · a020a84f
  zhaji authored Sep 07, 2022
  
  a020a84f
- Merge remote-tracking branch 'origin/develop' into develop · 4ec4186c
  huyuchen authored Sep 07, 2022
  
  4ec4186c
- 生成收入接口修改 · f50328f2
  huyuchen authored Sep 07, 2022
  
  f50328f2
- 错误信息记录表 · 38182755
  hongguangwu authored Sep 07, 2022
  
  38182755
- 错误信息记录表 · 474bc11c
  hongguangwu authored Sep 07, 2022
  
  474bc11c
- 错误信息记录表 · 69c1e0ba
  hongguangwu authored Sep 07, 2022
  
  69c1e0ba
- 收入优化 · 733303a7
  hongguangwu authored Sep 07, 2022
  
  733303a7
- Merge remote-tracking branch 'origin/develop' into develop · 2c5807b8
  huyuchen authored Sep 07, 2022
  
  2c5807b8
- Merge remote-tracking branch 'origin/develop' into develop · 43fca62f
  huyuchen authored Sep 07, 2022
  
  43fca62f
- BUG 修复 · d4e2cf19
  fangxinjiang authored Sep 07, 2022
  
  d4e2cf19
- 年终奖测算工具修改 · 2b26f318
  huyuchen authored Sep 07, 2022
  
  2b26f318
- Merge remote-tracking branch 'origin/develop' into develop · 467107ce
  fangxinjiang authored Sep 07, 2022
  
  467107ce
- BUG 修复 · 775bb706
  fangxinjiang authored Sep 07, 2022
  
  775bb706
- Merge remote-tracking branch 'origin/develop' into develop · 9db9e5ef
  hongguangwu authored Sep 07, 2022
  
  9db9e5ef
- 收入优化 · b3b1ae96
  hongguangwu authored Sep 07, 2022
  
  b3b1ae96
- Merge remote-tracking branch 'origin/develop' into develop · 404c4ce1
  fangxinjiang authored Sep 07, 2022
  
  404c4ce1
- BUG 修复 · 1ccc81f8
  fangxinjiang authored Sep 07, 2022
  
  1ccc81f8
- Merge remote-tracking branch 'origin/develop' into develop · 69151690
  huyuchen authored Sep 07, 2022
  
  69151690
- 年终奖测算工具修改 · 825df788
  huyuchen authored Sep 07, 2022
  
  825df788
- Merge branch 'feature-zhaji' into 'develop' · 4da53576
  查济 authored Sep 07, 2022
```
"feature-zhaJi:商险项目变更逻辑修改"

See merge request fangxinjiang/yifu!244
```
  4da53576
- "feature-zhaJi:商险项目变更逻辑修改" · be05f8cb
  zhaji authored Sep 07, 2022
  
  be05f8cb
- Merge branch 'feature-licancan' into 'develop' · 32bffff1
  李灿灿 authored Sep 07, 2022
```
订单、商险 导入导出数量20000校验

See merge request fangxinjiang/yifu!243
```
  32bffff1
- 订单、商险导入导出数量20000校验 · ca819135
  李灿灿 authored Sep 07, 2022
  
  ca819135