Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -1538,7 +1538,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
             // 保存 调动changeRecord
             IcUserChangeRecordEntity transferChangeRecord = fillChangeRecord(loginUserCustomerId, resiId, resiName, transferRecord.getId(), operator.getStaffId(),
-                    operator.getRealName(), sbBefore.toString(), sbAfter.toString(), "category", "类别", "", now);
+                    operator.getRealName(), sbBefore.toString(), sbAfter.toString(), "transfer", "调动", "", now);
             icUserChangeRecordDao.insert(transferChangeRecord);
 
             // 保存 类别变更changeRecord
@@ -1572,7 +1572,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
             if (!StringUtils.isAllBlank(categoryDescBefore, categoryDescAfter)) {
                 IcUserChangeRecordEntity categoryChangeRecord = fillChangeRecord(loginUserCustomerId, resiId, resiName, transferRecord.getId(), operator.getStaffId(),
-                        operator.getRealName(), categoryDescBefore, categoryDescAfter , "transfer", "调动", "", now);
+                        operator.getRealName(), categoryDescBefore, categoryDescAfter , "category", "类别", "", now);
                 icUserChangeRecordDao.insert(categoryChangeRecord);
             }