解决冲突

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

@@ -216,16 +216,13 @@ export default {
         lincaoAddView,
         lincaoReadView,
         openNewPageDetail,
-<<<<<<< HEAD
+        GH_cfBalance,
+        GH_cfProject,
         GH_agreeAction,
         GH_rejectAction,
         GH_submitAction,
         GH_retrieveAction,
         DEQKD_batchEditorAction
-=======
-        GH_cfBalance,
-        GH_cfProject
->>>>>>> origin/develop
     },
     billAction: {
         printMultiAction,
@@ -273,6 +270,7 @@ export default {
         GH_rejectAction,
         GH_submitAction,
         GH_retrieveAction,
+        DEQKD_batchEditorAction
     },
     billControl: {
         applyDetail,