fsUser冲突处理

fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -3,6 +3,8 @@ package com.fs.his.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.StringUtils;
+import com.vdurmont.emoji.EmojiParser;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;