Commit b07e2b09 by qiaoyanqi

冲突解决

parent 41e0a328
...@@ -72,9 +72,9 @@ import refreshTransactionStatus from "./query-actions/payments/refreshTransactio ...@@ -72,9 +72,9 @@ import refreshTransactionStatus from "./query-actions/payments/refreshTransactio
import throughQuery from "./query-actions/throughQuery"; import throughQuery from "./query-actions/throughQuery";
import queryDeleteBill from "./query-actions/queryDeleteBill"; import queryDeleteBill from "./query-actions/queryDeleteBill";
import openNewPageDetail from "./query-actions/openNewPageDetail"; import openNewPageDetail from "./query-actions/openNewPageDetail";
import DEQKD_batchEditorAction from "./query-actions/DEQKD_batchEditorAction";
import GH_cfBalance from "./query-actions/labourUnion/gh_cfBalance.js" import GH_cfBalance from "./query-actions/labourUnion/gh_cfBalance.js"
import GH_cfProject from "./query-actions/labourUnion/gh_cfProject.js" import GH_cfProject from "./query-actions/labourUnion/gh_cfProject.js"
import DEQKD_batchEditorAction from "./query-actions/DEQKD_batchEditorAction";
//control //control
import applyDetail from './control/applyDetail'; import applyDetail from './control/applyDetail';
import linkShowDetail from './control/linkShowDetail'; import linkShowDetail from './control/linkShowDetail';
...@@ -216,16 +216,9 @@ export default { ...@@ -216,16 +216,9 @@ export default {
lincaoAddView, lincaoAddView,
lincaoReadView, lincaoReadView,
openNewPageDetail, openNewPageDetail,
<<<<<<< HEAD
GH_agreeAction,
GH_rejectAction,
GH_submitAction,
GH_retrieveAction,
DEQKD_batchEditorAction
=======
GH_cfBalance, GH_cfBalance,
GH_cfProject GH_cfProject,
>>>>>>> origin/develop DEQKD_batchEditorAction
}, },
billAction: { billAction: {
printMultiAction, printMultiAction,
...@@ -272,7 +265,7 @@ export default { ...@@ -272,7 +265,7 @@ export default {
GH_agreeAction, GH_agreeAction,
GH_rejectAction, GH_rejectAction,
GH_submitAction, GH_submitAction,
GH_retrieveAction, GH_retrieveAction
}, },
billControl: { billControl: {
applyDetail, applyDetail,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment