Merge branch 'develop-raojiaguan' into 'develop'

冲突解决 See merge request GFP/RBC/rbc-frontend!105

Merge branch 'develop-raojiaguan' into 'develop'
冲突解决 See merge request GFP/RBC/rbc-frontend!105
e541c80a · 乔延琦 · 19275003 · bf49ffe4 · e541c80a
Commit e541c80a authored Mar 17, 2022 by 乔延琦
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

mcon.js develop/@gms/gms-plugin-billexpand/src/mcon.js +0 -3

No files found.
--- a/develop/@gms/gms-plugin-billexpand/src/mcon.js
+++ b/develop/@gms/gms-plugin-billexpand/src/mcon.js
@@ -371,11 +371,8 @@ export default {
        EqualsMasterAndSubField,
        SubTableHasContainField,
        GetUserStaffInfo,
-<<<<<<< Updated upstream
        ApplyTemplateString,
-=======
        UpdateBillMoneyFunction
->>>>>>> Stashed changes
    },
    routes : {
        showPrint: {