Skip to content

R
rbc-demo
Commit bf56d903 by yangchen
Options

解决冲突

parent 30f5e258
Showing with 3 additions and 5 deletions
develop/@gms/gms-plugin-billexpand/src/mcon.js
...@@ -216,16 +216,13 @@ export default { ...@@ -216,16 +216,13 @@ export default {
lincaoAddView, lincaoAddView,
lincaoReadView, lincaoReadView,
openNewPageDetail, openNewPageDetail,
<<<<<<< HEAD GH_cfBalance,
GH_cfProject,
GH_agreeAction, GH_agreeAction,
GH_rejectAction, GH_rejectAction,
GH_submitAction, GH_submitAction,
GH_retrieveAction, GH_retrieveAction,
DEQKD_batchEditorAction DEQKD_batchEditorAction
=======
GH_cfBalance,
GH_cfProject
>>>>>>> origin/develop
}, },
billAction: { billAction: {
printMultiAction, printMultiAction,
...@@ -273,6 +270,7 @@ export default { ...@@ -273,6 +270,7 @@ export default {
GH_rejectAction, GH_rejectAction,
GH_submitAction, GH_submitAction,
GH_retrieveAction, GH_retrieveAction,
DEQKD_batchEditorAction
}, },
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