Merge remote-tracking branch 'origin/master'

liujie

2023-09-27 4146ce356365a67fec0509d64ebcf52f74c7ade9

 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