Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2023-12-06 b020f119176dcc1c60ec1c97bd03d9a3efe8b5fa

 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;
}