Commits · d7d71bb10fbe522faf1da973d23fed125ac12c9e · fangxinjiang / yifu-mvp

23 Apr, 2023 3 commits
- MVP1.5.3-暂改收入ip，推送EKP · d7d71bb1
  hongguangwu authored Apr 23, 2023
  
  d7d71bb1
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · 587bd8b3
  hongguangwu authored Apr 23, 2023
  
  587bd8b3
- Merge branch 'MVP1.5.3-SALARY' into MVP1.5.3 · 0d27fdac
  hongguangwu authored Apr 23, 2023
  
  0d27fdac
19 Apr, 2023 3 commits
- 订单优化修改 · 93044215
  huyuchen authored Apr 19, 2023
  
  93044215
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · 9d059fbf
  hongguangwu authored Apr 19, 2023
```
# Conflicts:
#	yifu-common/yifu-common-ekp/src/main/resources/ekpSocialConfig.properties
```
  9d059fbf
- MVP1.5.3-暂改收入ip，推送EKP · 094536db
  hongguangwu authored Apr 19, 2023
  
  094536db
18 Apr, 2023 3 commits
- MVP1.3-salary薪资 · 9742c078
  hongguangwu authored Apr 18, 2023
  
  9742c078
- 订单优化修改 · 94872f07
  huyuchen authored Apr 18, 2023
  
  94872f07
- 订单优化修改 · ebd92989
  huyuchen authored Apr 18, 2023
  
  ebd92989
17 Apr, 2023 1 commit
- 订单优化修改 · db9eca18
  huyuchen authored Apr 17, 2023
  
  db9eca18
13 Apr, 2023 4 commits
- EKP1.2-工资推送 · b8f6ecb7
  hongguangwu authored Apr 13, 2023
  
  b8f6ecb7
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · 44cbd7e9
  huyuchen authored Apr 13, 2023
  
  44cbd7e9
- 派单优化修改 · d23a327a
  huyuchen authored Apr 13, 2023
  
  d23a327a
- EKP1.2-工资推送 · 9be99c70
  hongguangwu authored Apr 13, 2023
  
  9be99c70
12 Apr, 2023 6 commits
- Merge branch 'MVP1.5.3' into develop · 90b8e4c5
  huyuchen authored Apr 12, 2023
```
# Conflicts:
#	yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/config/CASproperties.java
#	yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/filter/PasswordDecoderFilter.java
```
  90b8e4c5
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · 8f84461c
  hongguangwu authored Apr 12, 2023
  
  8f84461c
- MVP1.5.3-单增的合同日期 · 200e2372
  hongguangwu authored Apr 12, 2023
  
  200e2372
- 商险到期调整 · 8776aab4
  fangxinjiang authored Apr 12, 2023
  
  8776aab4
- 派单分项目派单状态处理 · 0012a00d
  fangxinjiang authored Apr 12, 2023
  
  0012a00d
- 商险到期调整 · e0c7174e
  fangxinjiang authored Apr 12, 2023
  
  e0c7174e
11 Apr, 2023 6 commits
- 花名册导出 · f6c67073
  fangxinjiang authored Apr 11, 2023
  
  f6c67073
- 商险到期调整 · e4bdc41c
  fangxinjiang authored Apr 11, 2023
  
  e4bdc41c
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · 5ae39988
  fangxinjiang authored Apr 11, 2023
  
  5ae39988
- 派单分项目派单状态处理 · 36889278
  fangxinjiang authored Apr 11, 2023
  
  36889278
- MVP1.5.3-部分失败的单增 · 53a0258b
  hongguangwu authored Apr 11, 2023
  
  53a0258b
- 派单优化修改 · add8e452
  huyuchen authored Apr 11, 2023
  
  add8e452
10 Apr, 2023 14 commits
- 派单优化修改 · da837317
  huyuchen authored Apr 10, 2023
  
  da837317
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · 32099461
  hongguangwu authored Apr 10, 2023
  
  32099461
- MVP1.5.3-收入月份 · dd0929ba
  hongguangwu authored Apr 10, 2023
  
  dd0929ba
- 派单分项目派单状态处理 · 5dce737e
  fangxinjiang authored Apr 10, 2023
  
  5dce737e
- 预派单优化修改 · cb21c294
  huyuchen authored Apr 10, 2023
  
  cb21c294
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · 922eaf59
  huyuchen authored Apr 10, 2023
  
  922eaf59
- 预派单优化修改 · 5f3441e1
  huyuchen authored Apr 10, 2023
  
  5f3441e1
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · efbf9fff
  fangxinjiang authored Apr 10, 2023
  
  efbf9fff
- 商险到期调整 · fe9c9ce7
  fangxinjiang authored Apr 10, 2023
  
  fe9c9ce7
- MVP1.5.3-收入月份 · ef2578d6
  hongguangwu authored Apr 10, 2023
  
  ef2578d6
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · e8a03cae
  hongguangwu authored Apr 10, 2023
  
  e8a03cae
- MVP1.5.3-收入月份 · 2eca8685
  hongguangwu authored Apr 10, 2023
  
  2eca8685
- Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3 · 69444cb0
  fangxinjiang authored Apr 10, 2023
  
  69444cb0
- 用户类型调整 · 2cc250d9
  fangxinjiang authored Apr 10, 2023
  
  2cc250d9