Skip to content

Y
yifu-mvp
Switch branch/tag
  1. 08 Dec, 2022 10 commits
    • fangxinjiang's avatar
      MVP8号版本 · dbd51635
      fangxinjiang authored
      dbd51635
    • fangxinjiang's avatar
      MVP8号版本 · f3455e63
      fangxinjiang authored
      f3455e63
    • fangxinjiang's avatar
      MVP8号版本 · b7ce6f4a
      fangxinjiang authored
      b7ce6f4a
    • fangxinjiang's avatar
      MVP8号版本 · 806be6f1
      fangxinjiang authored
      806be6f1
    • fangxinjiang's avatar
      MVP8号版本 · a26b75bb
      fangxinjiang authored
      a26b75bb
    • fangxinjiang's avatar
      Merge branch 'develop' · 3d821375
      fangxinjiang authored 
      # Conflicts:
#	yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java
#	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/java/com/yifu/cloud/plus/v1/yifu/salary/util/DoJointSalaryAsyncTask.java
#	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
#	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
#	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
#	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
#	yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
      3d821375
    • huyuchen's avatar
      收入生成打标修改 · 1ec442a9
      huyuchen authored
      1ec442a9
    • huyuchen's avatar
      收入生成打标修改 · 383c7130
      huyuchen authored
      383c7130
    • huyuchen's avatar
      收入生成打标修改 · f9402c13
      huyuchen authored
      f9402c13
    • huyuchen's avatar
      申报对象修改 · 4c067a75
      huyuchen authored
      4c067a75
  3. 07 Dec, 2022 4 commits
  5. 06 Dec, 2022 8 commits
  7. 05 Dec, 2022 15 commits
  9. 03 Dec, 2022 1 commit
  11. 02 Dec, 2022 2 commits