brtcsg修改

8deb7f8a · liaoxing · d3fa6562 · 8deb7f8a
Commit 8deb7f8a authored Aug 18, 2023 by liaoxing
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

index.js src/business/brtcsg/model/index.js +0 -5

No files found.
--- a/src/business/brtcsg/model/index.js
+++ b/src/business/brtcsg/model/index.js
@@ -88,13 +88,8 @@ export default class Brtcsg {
          shgref: '',
          ownref: '',
          docsta:'',
-<<<<<<< HEAD
-          nam: '',
-          branchinr: "",
-=======
          branchinr:'',
          nam: ''
->>>>>>> 783b536c7717d88bb1fc6b8313d21fdd8f61e24a
        },
        cbs: {
          opn1: {