Merge branch 'feature/shouxin' into develop

# Conflicts:
#	src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql
[refactor] 添加描述字段

src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview

@@ -740,7 +740,7 @@
 
                     <a:columns>
                         <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110"/>
-                        <a:column name="receipt_type" align="center" prompt="CSH510.CSH_TRANSACTION.RECEIPT_TYPE" width="100"/>
+                        <a:column name="receipt_type_n" align="center" prompt="CSH510.CSH_TRANSACTION.RECEIPT_TYPE" width="100"/>
                         <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
                         <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
                         <a:column name="returned_amount" prompt="CSH510.CSH_TRANSACTION.RETURN_AMOUNT" align="right" renderer="Leaf.formatMoney" />

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

@@ -34,7 +34,6 @@
                      continue;
 
                     }
-
                     //否则的话添加必要的字段
                     record.set('receipt_type','IMPORT');
                     record.set('bank_account_num',record.get('attribute_1'));