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

Andru

2024-01-12 251d763fe5a8ea2ac9d817f6d7aaead925852d7f

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