Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 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