Merge branch 'dev' of licailing/uwip into master

src/main/vue/src/components/domesticPatent/RegisterComplate.vue

@@ -8,7 +8,7 @@
             label-width="140px"
             style="padding-right: 130px"
         >
-            <el-form-item label="客户付款凭证/截图" prop="attachment1">
+            <el-form-item label="授予专利通知书" prop="attachment1">
                 <attachment-upload
                     v-model="form.attachment1"
                     :fileSize.sync="form.attachment1.size"
@@ -39,7 +39,7 @@ export default {
     data() {
         return {
             form: {
-                attachment1: { attachmentName: '客户付款凭证/截图', fileName: '', url: '', remark: '', size: '' },
+                attachment1: { attachmentName: '授予专利通知书', fileName: '', url: '', remark: '', size: '' },
                 attachment2: { attachmentName: '专利证书', fileName: '', url: '', remark: '', size: '' }
             },
             show: false,
@@ -47,7 +47,7 @@ export default {
                 attachment1: {
                     validator: (rule, value, callback) => {
                         if (!value.url) {
-                            callback(new Error('请上传客户付款凭证/截图'));
+                            callback(new Error('请上传授予专利通知书'));
                         } else {
                             callback();
                         }

src/main/vue/src/components/fee/FeeList.vue

@@ -20,8 +20,8 @@
                     <el-tag :type="row.status === 'UNPAID' ? 'warning' : ''">{{ statusFormatter(row.status) }}</el-tag>
                 </template>
             </el-table-column>
-            <el-table-column prop="patentPartnerId" label="专利权人" min-width="120px"> </el-table-column>
-            <el-table-column prop="payPartnerId" label="支付对象" min-width="120px"> </el-table-column>
+            <el-table-column prop="patentPartner" label="专利权人" min-width="120px"> </el-table-column>
+            <el-table-column prop="payPartner" label="支付对象" min-width="120px"> </el-table-column>
             <el-table-column prop="amount" label="金额" min-width="120px"> </el-table-column>
             <el-table-column prop="currencyMaintenanceId" label="币种" min-width="100px"> </el-table-column>
             <el-table-column prop="paymentDeadline" label="支付期限" min-width="100px"> </el-table-column>