代码冲突解决

src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue

@@ -326,7 +326,7 @@ export default {
         SPECIFICATION_TYPES: [''],
         CATEGORY_LIST: [''],
         STATUS: '',
-        ASSOCIATION: '0',
+        ASSOCIATION: '4',
         types: [],
         specification_types: [],
         category_list: [],

src/views/threeSystems/lawsRegulations/components/list.vue

@@ -288,7 +288,7 @@ export default {
           STATUS: this.form.STATUS,
           TYPE: this.form.TYPE_NAME,
           DATE: this.form.DATE,
-          TEXT_NAME: this.TEXT_NAME,
+          TEXT_NAME: this.form.TEXT_NAME,
           ASSOCIATION: '4',
           CORPINFO_ID: '0',
           MIGRATION_FLAG: '1'