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

fwq

2024-05-17 77318cea0ffa3a0ac2402e3dea3077f48cef2dea

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