Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-05-29 7a3a4f8012a72f80d8dd62064a76655c803da864

 CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs

@@ -203,6 +203,7 @@
                        obj.distributionCutMoney = p.distributionCutMoney;
                        obj.cutMoney = p.cutMoney;
                        obj.distributionPrice= p.distributionPrice;
                        obj.isCustomizable = p.isCustomizable;
                        products.Add(obj);

                        var pd = new CoreCmsProductsDistribution();
@@ -257,7 +258,7 @@
                    obj.distributionCutMoney = oldObj.distributionCutMoney;
                    obj.cutMoney = oldObj.cutMoney;
                    obj.distributionPrice = oldObj.distributionPrice;

                    obj.isCustomizable = oldObj.isCustomizable;
                    if (string.IsNullOrEmpty(obj.images))
                    {
                        obj.images = goods.image;
@@ -551,6 +552,7 @@
                                    p.distributionPrice = child.distributionPrice;
                                    p.cutMoney = child.cutMoney;
                                    p.distributionCutMoney = child.distributionCutMoney;
                                    p.isCustomizable= child.isCustomizable;

                                }
                            });
@@ -637,6 +639,7 @@
                            obj.distributionPrice = p.distributionPrice;
                            obj.cutMoney = p.cutMoney;
                            obj.distributionCutMoney = p.distributionCutMoney;
                            obj.isCustomizable  =p.isCustomizable;
                            if (string.IsNullOrEmpty(p.images))
                            {
                                obj.images = oldModel.image;
@@ -697,6 +700,7 @@
                            obj.distributionPrice = newObj.distributionPrice;
                            obj.cutMoney = newObj.cutMoney;
                            obj.distributionCutMoney = newObj.distributionCutMoney;
                            obj.isCustomizable = newObj.isCustomizable;
                            if (string.IsNullOrEmpty(newObj.images))
                            {
                                obj.images = oldModel.image;
@@ -732,6 +736,7 @@
                        obj.distributionPrice = newObj.distributionPrice;
                        obj.cutMoney = newObj.cutMoney;
                        obj.distributionCutMoney = newObj.distributionCutMoney;
                        obj.isCustomizable = newObj.isCustomizable;
                        if (string.IsNullOrEmpty(newObj.images))
                        {
                            obj.images = oldModel.image;