Merge branch 'master-base' into master-fwq-爆款活动2.0

fwq

2024-07-17 cb7bf61ddec695b25f8fe509815c5e5794180b0f

 phis-download-feign/src/main/java/com/hz/his/dto/DConsumablesDto.java

@@ -9,6 +9,5 @@
 **/
@Data
public class DConsumablesDto extends DCommonDto {


    private Integer type;
}