解决因do声明org变量导致包冲突

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/domain/%DE%.java.ftl

@@ -14,6 +14,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import ${pub.getPKGCodeName()}.util.domain.EntityBase;
 import ${pub.getPKGCodeName()}.util.annotation.DEField;
 import ${pub.getPKGCodeName()}.util.enums.DEPredefinedFieldType;
@@ -28,6 +30,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import ${pub.getPKGCodeName()}.util.domain.EntityMP;
 
+
 /**
  * 实体[${item.getLogicName()}]
  */
@@ -222,7 +225,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
      * 获取 [${keyField.getLogicName()}]
      */
     public ${srfjavatype(keyField.getStdDataType())} get${publicCodeName}(){
-        if(org.springframework.util.ObjectUtils.isEmpty(${privateCodeName})){
+        if(ObjectUtils.isEmpty(${privateCodeName})){
             ${privateCodeName}=(${srfjavatype(keyField.stdDataType)})getDefaultKey(true);
         }
         return ${privateCodeName};
@@ -230,7 +233,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
 
     @Override
     public Serializable getDefaultKey(boolean gen) {
-        return org.springframework.util.DigestUtils.md5DigestAsHex(${getUnionKey(item.getUnionKeyValuePSDEFields())}.getBytes());
+        return DigestUtils.md5DigestAsHex(${getUnionKey(item.getUnionKeyValuePSDEFields())}.getBytes());
     }
     </#if>
 }