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

wangrenhuang

2023-11-13 d987db2b6f1cd3cdf09cd3c5bb4b11896a4c3b26

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