合并冲突

53ba39ac · lp784568205 · 9688e522 · 53ba39ac
Commit 53ba39ac authored Feb 09, 2022 by lp784568205
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

src/components/ptCxForm_components.vue
+0 -4

No files found.
--- a/src/components/ptCxForm_components.vue
+++ b/src/components/ptCxForm_components.vue
@@ -1601,13 +1601,9 @@
                  pageBs == 'djgzfxxsxx' ||
                  pageBs == 'queryXslb' ||
                  pageBs == 'queryWysp' ||
-<<<<<<< HEAD
                  pageBs == 'queryRole' ||
-                  pageBs == 'queryMbxx'
-=======
                  pageBs == 'queryQtypfx' ||
                  pageBs == 'queryRole'
->>>>>>> e13dfc56d5f9b9a361381f0f86cf898dca3120fd
                )
              "
              >修改</span