Merge branch 'dev' into 'dev_camtest'

# Conflicts:
#   SLN/%PUBPRJ%-core/src/main/resources/rules/%DE%/%ITEM_PKGPATH%/after.drl.ftl
#   SLN/%PUBPRJ%-core/src/main/resources/rules/%DE%/%ITEM_PKGPATH%/before.drl.ftl

SLN/%PUBPRJ%-core/src/main/resources/rules/%DE%/%ITEM_PKGPATH%/after.drl.ftl

@@ -20,6 +20,7 @@ global ${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lo
     </#list>
 </#if>
 <#if hasAfterLogic>
+import ${pub.getPKGCodeName()}.util.helper.CachedBeanCopier;
 global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.getCodeName()} et;
 
     <#if item.getAfterPSDEActionLogics?? && item.getAfterPSDEActionLogics()??>
@@ -85,8 +86,8 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
     <#assign actionLogicDE=actionlogic.getDstPSDE()>
     <#assign actionLogicDEAction=actionlogic.getDstPSDEAction()>
     ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.domain.${actionLogicDE.getCodeName()} actionLogicDE =new ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.domain.${actionLogicDE.getCodeName()}();
-    et.copyTo(actionLogicDE,true);
-    ${srfr7templcaseformat(actionLogicDE.getCodeName())}Service.${srfmethodname(actionLogicDEAction.getCodeName())}(actionLogicDE);
+    CachedBeanCopier.copy(et, actionLogicDE);
+    ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.${srfmethodname(actionLogicDEAction.getCodeName())}(actionLogicDE);
 </#macro>
 
 <#comment>实体行为附加逻辑-remove</#comment>

SLN/%PUBPRJ%-core/src/main/resources/rules/%DE%/%ITEM_PKGPATH%/before.drl.ftl

@@ -20,6 +20,7 @@ global ${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lo
     </#list>
 </#if>
 <#if hasBeforeLogic>
+import ${pub.getPKGCodeName()}.util.helper.CachedBeanCopier;
 global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.getCodeName()} et;
 
     <#if item.getBeforePSDEActionLogics?? && item.getBeforePSDEActionLogics()??>
@@ -85,8 +86,8 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
     <#assign actionLogicDE=actionlogic.getDstPSDE()>
     <#assign actionLogicDEAction=actionlogic.getDstPSDEAction()>
     ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.domain.${actionLogicDE.getCodeName()} actionLogicDE =new ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.domain.${actionLogicDE.getCodeName()}();
-    et.copyTo(actionLogicDE,true);
-    ${srfr7templcaseformat(actionLogicDE.getCodeName())}Service.${srfmethodname(actionLogicDEAction.getCodeName())}(actionLogicDE);
+    CachedBeanCopier.copy(et, actionLogicDE);
+    ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.${srfmethodname(actionLogicDEAction.getCodeName())}(actionLogicDE);
 </#macro>
 
 <#comment>实体行为附加逻辑-remove</#comment>