Merge branch 'dev-fix-20210715' into 'release'

包邮金额最大不能超过99999.99!,code review:bo.dang

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!277

src/views/freight/freight-config.vue

@@ -708,6 +708,10 @@ export default {
         if (!valid) return false;
         // vm.goodCondition.goodIds = [];
         // vm.goodCondition.goodIds = vm.setIdArray(vm.goodCondition.goodIdList);
+        if(vm.goodCondition.conditionType == 2 && vm.goodCondition.number >= 100000){
+          this.$message({ type: "warning", message: "包邮金额最大不能超过99999.99!" });
+          return;
+        }
 
         if(vm.resultForm.goodConditionReqList.length > 0){
           // this.formData.tabs[0].contents = vm.resultForm.goodConditionReqList.filter(function (item) {