Merge branch 'master-fix' into pre-release

src/views/ecw/customer/addPotentialCustom.vue

@@ -145,7 +145,7 @@ export default {
         if (valId) {
           let p = {...this.form}
           p.type = p.type.join(',')
-          p.customerContacts[0].name = p.name + p.customerContacts[0].phoneNew
+          p.customerContacts[0].name = p.name
           createPotential(p).then(r => {
             if (r.code === 0) {
               this.$emit('change');

src/views/ecw/productPrice/edit.vue

@@ -874,11 +874,7 @@ export default {
       return packging
         .filter((item) => !!item.packagingTypes)
         .map((item) => {
-          if (item.packagingTypes.length === 0){
-            item.packagingTypes = "";
-          } else {
-            item.packagingTypes = item.packagingTypes?.join(",") || "";
-          }
+          item.packagingTypes = item.packagingTypes?.join(",") || "";
           return item;
         });
     },