Merge remote-tracking branch 'origin/dev' into dev

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -1698,7 +1698,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
             </#if>
         ${de.codeName} ${tempEntityName}=new ${de.codeName}();
             <#if keyfield??>
-        et.set(${keyfield.codeName},key);
+        et.set("${keyfield.codeName?lower_case}",key);
             </#if>
             <#break>
         </#list>