Merge remote-tracking branch 'origin/dev/2025b' into dev/2025b

src/views/products/Detail/ProductInfoForm.jsx

@@ -413,6 +413,16 @@ const formValuesMapper = (values) => {
       { key: 'city_id', transform: (value) => value?.value || value?.key || '' },
       { key: 'city_name', transform: (value) => value?.label || '' },
     ],
+    'city_list': [
+      { key: 'city_list', transform: (value) => {
+        return value.map(option => {
+          return {
+            id: option?.value || option?.key || '',
+            name: option?.label || ''
+          }
+        })
+      }},
+    ],
     'dept': { key: 'dept_id', transform: (value) => (typeof value === 'string' ? value : value?.value || value?.key || '') },
     'open_weekdays': { key: 'open_weekdays', transform: (value) => (Array.isArray(value) ? value.join(',') : value) },
     // 'recommends_rate': { key: 'recommends_rate', transform: (value) => ((typeof value === 'string' || typeof value === 'number') ? value : value?.value || value?.key || '') },