补充联合键值中出现时间类型属性的处理

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

@@ -22,6 +22,7 @@ import ${pub.getPKGCodeName()}.util.domain.EntityBase;
 import ${pub.getPKGCodeName()}.util.annotation.DEField;
 import ${pub.getPKGCodeName()}.util.enums.DEPredefinedFieldType;
 import ${pub.getPKGCodeName()}.util.enums.DEFieldDefaultValueType;
+import ${pub.getPKGCodeName()}.util.helper.DataObject;
 import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
@@ -942,13 +943,19 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
     <#assign formatKey="">
     <#assign formatValue="">
     <#list item.getUnionKeyValuePSDEFields() as defield>
+        <#assign dataType = (defield.getDataType())!"">
         <#assign unionKeyPrivateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') >
         <#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first >
         <#assign formatKey=formatKey+"%s">
         <#if defield_has_next>
             <#assign formatKey=formatKey+"||">
         </#if>
+        <#comment>补充联合键值中出现时间类型属性的处理</#comment>
+        <#if dataType=="DATETIME" || dataType=="DATE" ||  dataType=="TIME">
+            <#assign formatValue=formatValue+"DataObject.datetimeFormat.format(this.get"+unionKeyPublicCodeName+"())">
+        <#else>
             <#assign formatValue=formatValue+"this.get"+unionKeyPublicCodeName+"()">
+        </#if>
         <#if defield_has_next>
             <#assign formatValue=formatValue+",">
         </#if>