Commits · 8051e2bc22659b7e38b66b27bf59887eac22790b · fangxinjiang / yifu-mvp

02 Aug, 2023 11 commits
- Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6 · 8051e2bc
  hongguangwu authored Aug 02, 2023
  
  8051e2bc
- Merge branch 'MVP1.5.6-salaryBack' into MVP1.5.6 · 3e6c8bc9
  hongguangwu authored Aug 02, 2023
```
# Conflicts:
#	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
#	yifu-salary/yifu-salary-biz/src/main/resources/logback-spring.xml
```
  3e6c8bc9
- 1.5.6-salaryBack-EKP退表，异步、记录异常 · 81165eef
  hongguangwu authored Aug 02, 2023
  
  81165eef
- Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6 · 8ef4a357
  wangzb authored Aug 02, 2023
  
  8ef4a357
- feature-wzb :公积金表格修改 · a44e1474
  wangzb authored Aug 02, 2023
  
  a44e1474
- feature-wzb :公积金表格导出及代发户添加 · 39945f01
  wangzb authored Aug 02, 2023
  
  39945f01
- 1.5.6-打日志 · c6e36e65
  hongguangwu authored Aug 02, 2023
  
  c6e36e65
- 1.5.6-打日志 · 1f4fc6c8
  hongguangwu authored Aug 02, 2023
  
  1f4fc6c8
- feature-wzb :公积金表格导出及代发户添加 · eb04ba3b
  wangzb authored Aug 02, 2023
  
  eb04ba3b
- Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6 · b8aa4f23
  wangzb authored Aug 02, 2023
```
# Conflicts:
#	yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/DispatchConstants.java
```
  b8aa4f23
- feature-wzb :公积金表格导出及代发户添加 · 7b331afc
  wangzb authored Aug 02, 2023
  
  7b331afc
01 Aug, 2023 10 commits
- 花名册修改 · 16050da3
  huyuchen authored Aug 01, 2023
  
  16050da3
- 花名册修改 · 61cc6ef9
  huyuchen authored Aug 01, 2023
  
  61cc6ef9
- 花名册修改 · 542bde40
  huyuchen authored Aug 01, 2023
  
  542bde40
- 花名册修改 · b250fffe
  huyuchen authored Aug 01, 2023
  
  b250fffe
- Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6 · 84b4ae03
  huyuchen authored Aug 01, 2023
  
  84b4ae03
- 花名册修改 · 5f9f41d3
  huyuchen authored Aug 01, 2023
  
  5f9f41d3
- 日志放开 · 2cff6d53
  fangxinjiang authored Aug 01, 2023
  
  2cff6d53
- 花名册修改 · 6c57035a
  huyuchen authored Aug 01, 2023
  
  6c57035a
- 花名册修改 · 7751a3db
  huyuchen authored Aug 01, 2023
  
  7751a3db
- 花名册修改 · 0a28f646
  huyuchen authored Aug 01, 2023
  
  0a28f646
31 Jul, 2023 13 commits
- Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6 · 17d89cd9
  fangxinjiang authored Jul 31, 2023
  
  17d89cd9
- BUG 优化 · 3a3ebd3c
  fangxinjiang authored Jul 31, 2023
  
  3a3ebd3c
- 花名册修改 · cc40bdb8
  huyuchen authored Jul 31, 2023
  
  cc40bdb8
- Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6 · b54ed2c1
  huyuchen authored Jul 31, 2023
  
  b54ed2c1
- 花名册修改 · 59819638
  huyuchen authored Jul 31, 2023
  
  59819638
- BUG 优化 · 991e465c
  fangxinjiang authored Jul 31, 2023
  
  991e465c
- Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6 · 979b40fe
  fangxinjiang authored Jul 31, 2023
  
  979b40fe
- BUG 优化 · cfc363e7
  fangxinjiang authored Jul 31, 2023
  
  cfc363e7
- 花名册修改 · f9de1200
  huyuchen authored Jul 31, 2023
  
  f9de1200
- 花名册修改 · 6982ecdb
  huyuchen authored Jul 31, 2023
  
  6982ecdb
- 花名册修改 · 3203076c
  huyuchen authored Jul 31, 2023
  
  3203076c
- 合同修改 · ebdaa694
  huyuchen authored Jul 31, 2023
  
  ebdaa694
- 合同修改 · fd995a55
  huyuchen authored Jul 31, 2023
  
  fd995a55
28 Jul, 2023 6 commits
- 合同修改 · ec862349
  huyuchen authored Jul 28, 2023
  
  ec862349
- 消息提醒修改 · 4840f48d
  huyuchen authored Jul 28, 2023
  
  4840f48d
- feature-wzb :续签代办bug修复 · a8b26698
  wangzb authored Jul 28, 2023
  
  a8b26698
- BUG 优化 · 6844c606
  fangxinjiang authored Jul 28, 2023
  
  6844c606
- Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6 · 5adc21b6
  fangxinjiang authored Jul 28, 2023
  
  5adc21b6
- BUG 优化档案项目数非空判断 · f44b1cdb
  fangxinjiang authored Jul 28, 2023
  
  f44b1cdb