Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

yudao-ui-admin-vue3/src/views/pressure2/qrReport/BoilerQrReport.vue

@@ -21,9 +21,9 @@ const boilerFields: Record<string, string> = {
   productNo: '产品编号',
   reportNo: '报告编号',
   mainConclusion: '检验结论',
-  nextCheckDate: '下次定期检验日期',
-  nextYearCheckDate: '下次年度检查日期',
-  nextPressureCheckDate: '下次耐压检验日期',
+  nextInCheckDate: '下次内部检验日期',
+  nextOutCheckDate: '下次外部检验日期',
+  // nextPressureCheckDate: '下次耐压检验日期',
   checkDate: '检验日期',
   // checkOrganization: '检验机构',
   checkTypeName: '检验性质',

yudao-ui-admin-vue3/src/views/pressure2/qrReport/QrReportView.vue

@@ -78,7 +78,8 @@ onMounted(() => {
 <style scoped>
 .qr-report-container {
   width: 100%;
-  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
   background-color: #f5f5f5;
 }