Merge remote-tracking branch 'origin/master'

src/views/modules/sampleManagement/technicalSpecificationList.vue

@@ -967,7 +967,7 @@
           let tempData = {
             site: this.$store.state.user.site,
             menuId: this.$route.meta.menuId,
-            documentNo: this.currentRow.applyNo
+            documentNo:this.currentRow.codeNo
           }
           getApprovalList(tempData).then(({data}) => {
             if (data && data.code === 0) {

src/views/modules/sys/user.vue

@@ -513,6 +513,13 @@
           min-width="50"
           label="项目号">
         </el-table-column>
+        <el-table-column
+          prop="projectName"
+          header-align="center"
+          align="center"
+          min-width="50"
+          label="项目名称">
+        </el-table-column>
         <el-table-column
           prop="projectDesc"
           header-align="center"