合并冲突

licp

2024-05-27 e59a71579f6afd21c76f9d45c3b3f09c28d03c41

 src/components/view/b1-report-preparation.vue

@@ -355,7 +355,8 @@
            title: row.entrustCode + ".docx",
            lang: 'zh-CN',
            isPrint: true,
            user:  { id: 1, name: userName},
            user_id: 1,
            user_name: userName,
            editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + row.entrustCode + ".docx"
          }
        })