Merge branch 'master-prod-new' into master-test

Andru

2023-11-14 17c4723b448727918cb45d871d8b1b1671c497c3

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