Merge branch 'feature/shouxin' into develop

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[fix] 修改编码规范

src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview

@@ -32,7 +32,6 @@
                   if( record.get('status') == 'ERROR'){
                         //不将这条数据传递到数组中
                      continue;
-
                     }
                     //否则的话添加必要的字段
                     record.set('receipt_type','IMPORT');
@@ -57,7 +56,7 @@
                 //开始导入数据
 
                 Leaf.showConfirm('提示', '确定要导入信息吗,有错误信息的数据将不会被导入', function() {
-
+                    Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
                     Leaf.request({
                         url: $('save_import_csh_transaction_receipt_data_link_id').getUrl(),
                         para: saveData,
@@ -65,10 +64,12 @@
                         success: function () {
                             import_flag = import_flag + 1;
                             $('tre_withdraw_subscriber_import_ds').query();
+                            Leaf.Masker.unmask(Ext.getBody());
                             Leaf.SideBar.show({
                                 msg: '操作成功',
                                 duration: 2000
                             });
+
                           //关闭该导入的界面
                             backBtn();
                         }