冲突解决

develop/@gms/gms-plugin-billexpand/src/mcon.js

@@ -72,9 +72,9 @@ import refreshTransactionStatus from "./query-actions/payments/refreshTransactio
 import throughQuery from "./query-actions/throughQuery";
 import queryDeleteBill from "./query-actions/queryDeleteBill";
 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_cfProject from "./query-actions/labourUnion/gh_cfProject.js"
+import DEQKD_batchEditorAction from "./query-actions/DEQKD_batchEditorAction";
 //control
 import applyDetail from './control/applyDetail';
 import linkShowDetail from './control/linkShowDetail';
@@ -216,16 +216,9 @@ export default {
         lincaoAddView,
         lincaoReadView,
         openNewPageDetail,
-<<<<<<< HEAD
-        GH_agreeAction,
-        GH_rejectAction,
-        GH_submitAction,
-        GH_retrieveAction,
-        DEQKD_batchEditorAction
-=======
         GH_cfBalance,
-        GH_cfProject
->>>>>>> origin/develop
+        GH_cfProject,
+        DEQKD_batchEditorAction
     },
     billAction: {
         printMultiAction,
@@ -272,7 +265,7 @@ export default {
         GH_agreeAction,
         GH_rejectAction,
         GH_submitAction,
-        GH_retrieveAction,
+        GH_retrieveAction
     },
     billControl: {
         applyDetail,