• huyuchen's avatar
    Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8 · bfa46593
    huyuchen authored
    # Conflicts:
    #	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeRegistrationPreController.java
    #	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/EmployeeRegistrationPreMapper.java
    #	yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/EmployeeRegistrationPreService.java
    #	yifu-archives/yifu-archives-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
    bfa46593
EmployeeRegistrationPreMapper.xml 13.9 KB