Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1

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

@@ -170,11 +170,17 @@
                                     #{value}
                                 </foreach>
                             </when>
-                            <otherwise>
+                            <when test="key=='method'">
                                 and test_case.method in
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
                                     #{value}
                                 </foreach>
+                            </when>
+                            <otherwise>
+                                and test_plan_test_case.status in
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
                             </otherwise>
                         </choose>
                     </if>

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

@@ -369,7 +369,7 @@
             {required: true, message: this.$t('user.input_email'), trigger: 'blur'},
             {
               required: true,
-              pattern: /^([A-Za-z0-9_\-.])+@([A-Za-z0-9]+\.)+[A-Za-z]{2,6}$/,
+              pattern: /^[a-zA-Z0-9_._-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
               message: this.$t('user.email_format_is_incorrect'),
               trigger: 'blur'
             }