Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.TradePavilion/CustomFormModule.cs

@@ -260,7 +260,7 @@ namespace Mall.Module.TradePavilion
             };
             if (selectItem.IsMultiple)
             {
-                List<string> valueList = JsonHelper.DeserializeObject<List<string>>(dropdownObj.GetStringValue("OptionValue"));
+                List<int> valueList = Common.ConvertHelper.StringToList(dropdownObj.GetStringValue("OptionValue").Split(','));
                 if (valueList != null && valueList.Count > 0)
                 {
                     selectItem.OptionValue = string.Join(",", valueList);

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -262,8 +262,8 @@ namespace Mall.WebApi.Controllers.MallBase
                                     {
                                         attr_group_name = smodel.Name,
                                         attr_group_id = smodel.Sort,
-                                        attr_id = svmodel.Id,
-                                        attr_name = svmodel.Name
+                                        attr_id = svmodel?.Id ?? 0,
+                                        attr_name = svmodel?.Name ?? ""
                                     });
                                 }
                                 decimal price_member = item.SellingPrice ?? 0;//未设会员价格的话  就为销售价格