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

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -70,7 +70,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         addTitle:'销售退货单',
         addXtype:'sale-salein-formpanel',
         defaultCondition:' pi_class = \'销售退货单\'',
-        baseVastUrl: 'http://192.168.253.48:8820/prodinout/',
+        baseVastUrl: '/api/sale/prodinout/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',