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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 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