Merge branch 'master-fix' into pre-release

# Conflicts:
#	src/views/ecw/productPrice/edit.vue

src/views/ecw/productPrice/edit.vue

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