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

解决添加条件出错问题，code review:bo.dang

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

src/views/freight/freight-config.vue

@@ -307,6 +307,7 @@ export default {
       setAddVisible: false,
       storeId:'',
       goodCondition:{
+        id:"",
         goodIds:[],
         conditionType:'',
         number:'',
@@ -502,6 +503,7 @@ export default {
     addGoodsCondition(){
       vm.remoteMethod();
       vm.goodCondition = {
+          id:"",
           goodIds:[],
           conditionType:'',
           number:'',
@@ -620,7 +622,7 @@ export default {
         this.formData.introId = res.data.storeExpressFeeIntro.id;
       })
     },
-    
+
 
     // 本应分页加载，这个设置pageSize为最大值解决
     remoteMethod(val) {