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

frontend/saas-web/app/view/money/report/PayDetail.js

@@ -6,7 +6,7 @@ Ext.define('saas.view.money.report.PayDetail', {
     viewModel: 'money-report-paydetail',
     viewName: 'money-report-paydetail',
 
-    groupField:'pd_vendid',
+    groupField:'pd_vendname',
     groupHeaderTpl: '供应商名称: {[values.rows[0].data.pd_vendname]}',
     listUrl: '/api/money/report/payDetail',
     defaultCondition: null,

frontend/saas-web/app/view/money/report/RecDetail.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.money.report.RecDetail', {
 
     viewName: 'money-report-recdetail',
 
-    groupField: 'rd_custid',
+    groupField: 'rd_custname',
     groupHeaderTpl: '客户名称: {[values.rows[0].data.rd_custname]}',
     listUrl: '/api/money/report/recDetail',
     defaultCondition: null,