Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml

@@ -299,8 +299,8 @@
         select test_plan_test_case.*, test_case.*
         from test_plan_test_case
         inner join test_case on test_plan_test_case.case_id = test_case.id
-        where status != 'Prepare'
-        and status != 'Underway'
+        where test_plan_test_case.status != 'Prepare'
+        and test_plan_test_case.status != 'Underway'
         and test_plan_test_case.Executor = #{request.executor}
         and test_plan_test_case.plan_id in
         <foreach collection="request.planIds" item="planId" separator="," open="(" close=")">

frontend/src/business/components/settings/system/BaseSetting.vue

@@ -42,7 +42,7 @@ export default {
         url: [
           {
             required: true,
-            message: this.$t('system_par'),
+            message: this.$t('system_config.base.url_is_null'),
             trigger: ['change', 'blur']
           },
         ],

frontend/src/i18n/en-US.js

@@ -240,7 +240,8 @@ export default {
     base_config: 'Base Config',
     base: {
       url: 'Website URL',
-      url_tip: 'example：http://localhost:8081'
+      url_tip: 'example：http://localhost:8081',
+      url_is_null: 'The current site URL cannot be empty'
     }
   },
   workspace: {

frontend/src/i18n/zh-CN.js

@@ -241,7 +241,8 @@ export default {
     base_config: '基本配置',
     base: {
       url: '当前站点URL',
-      url_tip: '例如：http://localhost:8081'
+      url_tip: '例如：http://localhost:8081',
+      url_is_null: '当前站点URL不能为空'
     }
   },
   workspace: {

frontend/src/i18n/zh-TW.js

@@ -241,7 +241,8 @@ export default {
     base_config: '基本配置',
     base: {
       url: '當前站點URL',
-      url_tip: '例如：http://localhost:8081'
+      url_tip: '例如：http://localhost:8081',
+      url_is_null: '當前站點URL不能為空'
     }
   },
   workspace: {