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

Andru

2023-10-30 c8cab1c710ba1ddd09fdba3d9e9e91a09dd3b4a4

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