Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/MaterialPromotionService.java

@@ -92,9 +92,9 @@ public class MaterialPromotionService implements IPromotionService {
                     }
                     //设置行记录参加的活动及总优惠
                     ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
-                    activityDiscountsDto.setActivityCode(material.getDetails().activityCode);
-                    activityDiscountsDto.setActivityName(material.getDetails().activityName);
-                    activityDiscountsDto.setActivityType(material.getDetails().activityType);
+                    activityDiscountsDto.setActivityCode(material.getDetails().getActivityCode());
+                    activityDiscountsDto.setActivityName(material.getDetails().getActivityName());
+                    activityDiscountsDto.setActivityType(material.getDetails().getActivityType());
                     activityDiscountsDto.setDiscountAmount(material.getApportionAmount());
                     activityDiscountsDtos.add(activityDiscountsDto);