1. 13 Apr, 2026 3 commits
    • fangxinjiang's avatar
      拒绝入职优化-fxj · 4762cce9
      fangxinjiang authored
      4762cce9
    • hongguangwu's avatar
      Merge branch 'develop' · dddcdfbc
      hongguangwu authored
      # Conflicts:
      #	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
      #	yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
      #	yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TEmployeeInsurancePreMapper.xml
      #	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
      #	yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
      dddcdfbc
    • hongguangwu's avatar
      Merge remote-tracking branch 'origin/MVP1.7.21' into develop · 21a70882
      hongguangwu authored
      # Conflicts:
      #	yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
      21a70882
  2. 10 Apr, 2026 4 commits
  3. 09 Apr, 2026 14 commits
  4. 08 Apr, 2026 19 commits