Merge branch 'dev'

src/locale/lanres/userCustom/userCustom_en_US.ts

 // 用户自定义语言资源 英文
-export default {
-
-    
-};
\ No newline at end of file
+function getLocaleResource(){
+    const data:any = {};
+    return data;
+}
+export default getLocaleResource;
\ No newline at end of file

src/locale/lanres/userCustom/userCustom_zh_CN.ts

 // 用户自定义语言资源 中文
-export default {
-
-    
-};
\ No newline at end of file
+function getLocaleResource(){
+    const data:any = {};
+    return data;
+}
+export default getLocaleResource;
\ No newline at end of file

src/locale/logic/common/common-logic-base.ts

+export default {
+    /**
+     * 应用通用显示处理
+     * @param param1 显示文本 
+     * @param param2 多语言对象
+     */
+    appcommonhandle:function(param1:any,param2:any){
+        return param1;
+    }
+}
\ No newline at end of file

src/locale/logic/common/common-logic.ts

+import CommonLogicBase from './common-logic-base';
+
+const CommonLogicOwnData = {};
+const targetData = Object.assign(CommonLogicBase, CommonLogicOwnData);
+export default targetData;
\ No newline at end of file

src/locale/logic/custom/common-logic.ts

+export default {
+
+}
\ No newline at end of file