Merge remote-tracking branch 'origin/master'

nickchange

2023-10-27 200acf9283ff06e75874df263b1e125a71e76215

 cloud-server-activity/src/main/java/com/dsh/activity/model/response/GoodsInfoOneVo.java

@@ -5,7 +5,6 @@
import lombok.NoArgsConstructor;

import java.math.BigDecimal;
import java.util.List;

@Data
@AllArgsConstructor