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

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -152,6 +152,14 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         dataIndex: 'pd_ordercode',
         width: 150
     }, {
+        text: '录入人',
+        dataIndex: 'creatorName',
+        width: 100
+    },{
+        text: '审核人',
+        dataIndex: 'pi_auditman',
+        width: 100
+    },{
         text: '备注',
         dataIndex: 'pd_remark',
         width: 250