merge

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -34,11 +34,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         xtype : "detailGridField", 
         storeModel:'saas.model.money.FundTransfer',
         detnoColumn:  'ftd_detno',
-<<<<<<< HEAD
         deleteDetailUrl:basePath+'fundtransfer/deleteItem/',
-=======
-        _deleteDetailUrl:'/api/fundtransfer/deleteItem/',
->>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
         columnWidth : 1,
         columns : [
             {

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -15,15 +15,9 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
      _relationColumn: 'ord_orid',
-<<<<<<< HEAD
      _readUrl:basePath+'money/othreceipts/read/',
      _saveUrl:basePath+'money/othreceipts/save',
      _deleteUrl:basePath+'money/othreceipts/delete/',  
-=======
-     _readUrl:'/api/money/othreceipts/read/',
-     _saveUrl:'/api/money/othreceipts/save',
-     _deleteUrl:'/api/money/othreceipts/delete/', 
->>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
      initId:0,
 
     defaultItems: [{

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -45,12 +45,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         addTitle: '其它收入单',
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
-<<<<<<< HEAD
         baseVastUrl: basePath+'money/othreceipts/',
-=======
-       // baseVastUrl: '/api/money/othreceipts/',
-        baseVastUrl: 'http://192.168.253.129:8940/othreceipts/',
->>>>>>> 12e93723100fb3a14b86475ac9edfc82a3c9e52e
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',