Merge branch 'master' into develop-rc

TEAMModelOS/ClientApp/src/view/jyzx/HourDetail.vue

@@ -62,7 +62,7 @@ export default {
     },
     methods: {
         openReport() {
-            window.open('/web/viewer.html?file=' + encodeURIComponent(this.hourInfo.offlineReport.blob + this.$store.state.user.userProfile.osblob_sas))
+            window.open('/web/viewer.html?file=' + encodeURIComponent(this.hourInfo.offlineReport.blob + '?' + this.$store.state.user.userProfile.osblob_sas))
         },
     }
 }