码表修改

src/config/CodeTable/index.js

@@ -7238,11 +7238,10 @@ const CodeTable = {
         { label: "无特殊规定", value: "无特殊规定" },
         { label: "有特殊规定，条件为：", value: "有特殊规定，条件为：" },
     ],
-<<<<<<< HEAD
+
     rmbrol:[
         { label: "Further Party", value: "Further Party" },
-    ]
-=======
+    ],
 	actpriflg:[
 		{label:"Show all accounts",value:"A" },
 		{label:"Show favourite account(s) only",value:"" },
@@ -8127,6 +8126,5 @@ const CodeTable = {
 		{label:"否",value:"N" },
 		{label:"是",value:"Y" },
 	]
->>>>>>> 779482b90afbf8e154dfb3ff7760e0337f03902d
 }
 export default CodeTable;