Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/option/business/shipping-template.js
#	src/option/business/transport-plan.js
#	src/option/business/waybill-manage.js
#	src/views/business/components/business-crud-page.vue
#	src/views/business/components/master-order-detail.vue
#	src/views/business/components/master-order-editor.vue
#	src/views/business/components/waybill-import-dialog.vue

src/option/base/common-address.js

@@ -122,8 +122,7 @@ export const createOption = () => ({
       maxlength: 20,
       formslot: true,
       rules: [
-        { max: 20, message: '联系方式不能超过20个字', trigger: 'blur' },
-        { pattern: /^\d*$/, message: '联系方式只能输入数字', trigger: 'blur' },
+        { pattern: /^1[3-9]\d{9}$/, message: '联系方式格式不正确', trigger: 'blur' },
       ],
     },
     {