Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7sfstdtempl/ibiz4jr7 into dev

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

 <#ibiztemplate>
 TARGET=PSDATAENTITY
 </#ibiztemplate>
+<#assign isDynaSys =false>
+<#if sys.getAllPSSystemModules()??>
+    <#list sys.getAllPSSystemModules() as module>
+        <#if module.getDynaInstMode()?? && (module.getDynaInstMode()?c=='1' || module.getDynaInstMode()?c=='2'  )>
+            <#assign isDynaSys =true>
+            <#break>
+        </#if>
+    </#list>
+</#if>
 <#comment>引入驼峰配置</#comment>
 <#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
 <#assign hasResetField=false>
@@ -132,6 +141,12 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
                 <#assign defieldano=defieldano+"dupCheck = DupCheck.ALL" >
             </#if>
         </#if>
+        <#if isDynaSys && defield.isMultiFormDEField?? && defield.isMultiFormDEField()?? && defield.isMultiFormDEField()==true>
+            <#if defieldano?? && defieldano!='' >
+                <#assign defieldano = defieldano+", ">
+            </#if>
+            <#assign defieldano = defieldano+"dynaInstTagField = true">
+        </#if>
     /**
      * ${defield.getLogicName()}
      */
@@ -460,6 +475,13 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable {
                 </#if>
             </#if>
         </#if>
+        <#if isDynaSys && defield.isMultiFormDEField?? && defield.isMultiFormDEField()?? && defield.isMultiFormDEField()==true>
+            <#if defieldano?? && defieldano!='' >
+                <#assign defieldano = defieldano+", ">
+            </#if>
+            <#assign defieldano = defieldano+"dynaInstTagField = true">
+        </#if>
+
     /**
      * ${defield.getLogicName()}
      */
@@ -633,6 +655,12 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable
                 </#if>
             </#if>
         </#if>
+        <#if isDynaSys && defield.isMultiFormDEField?? && defield.isMultiFormDEField()?? && defield.isMultiFormDEField()==true>
+            <#if defieldano?? && defieldano!='' >
+                <#assign defieldano = defieldano+", ">
+            </#if>
+            <#assign defieldano = defieldano+"dynaInstTagField = true">
+        </#if>
     /**
      * ${defield.getLogicName()}
      */
@@ -843,6 +871,12 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
                 </#if>
             </#if>
         </#if>
+        <#if isDynaSys && defield.isMultiFormDEField?? && defield.isMultiFormDEField()?? && defield.isMultiFormDEField()==true>
+            <#if defieldano?? && defieldano!='' >
+                <#assign defieldano = defieldano+", ">
+            </#if>
+            <#assign defieldano = defieldano+"dynaInstTagField = true">
+        </#if>
     /**
      * ${defield.getLogicName()}
      */

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/annotation/DEField.java.ftl

 <#ibiztemplate>
 TARGET=PSSYSTEM
 </#ibiztemplate>
+<#assign isDynaSys =false>
+<#if sys.getAllPSSystemModules()??>
+	<#list sys.getAllPSSystemModules() as module>
+		<#if module.getDynaInstMode()?? && (module.getDynaInstMode()?c=='1' || module.getDynaInstMode()?c=='2'  )>
+			<#assign isDynaSys =true>
+			<#break>
+		</#if>
+	</#list>
+</#if>
 package ${pub.getPKGCodeName()}.util.annotation;
 
 import ${pub.getPKGCodeName()}.util.enums.DEFieldDefaultValueType;
@@ -79,5 +88,11 @@ public @interface DEField
 	 * 范围属性
 	 */
 	String dupCheckField() default "";
+	<#if isDynaSys>
+	/**
+	 * 动态实例标记属性
+	 */
+	boolean dynaInstTagField() default false;
+	</#if>
 }
 

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/domain/DELogic.java.ftl

 <#ibiztemplate>
 TARGET=PSSYSTEM
 </#ibiztemplate>
+<#assign isDynaSys =false>
+<#if sys.getAllPSSystemModules()??>
+    <#list sys.getAllPSSystemModules() as module>
+        <#if module.getDynaInstMode()?? && (module.getDynaInstMode()?c=='1' || module.getDynaInstMode()?c=='2'  )>
+            <#assign isDynaSys =true>
+            <#break>
+        </#if>
+    </#list>
+</#if>
 package ${pub.getPKGCodeName()}.util.domain;
 
 import lombok.Data;
 import org.flowable.bpmn.model.Process;
+import org.springframework.core.io.Resource;
 import org.kie.api.runtime.KieContainer;
 import java.io.File;
 import java.io.Serializable;
@@ -17,6 +27,6 @@ public class DELogic implements Serializable {
     Process process;
     KieContainer container;
     List<DELogic> refLogic;
-    List<File> refRuleFiles;
+    List<Resource> refRuleFiles;
     String md5;
 }