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

fwq

2024-07-08 6a3f8907a2f9d240f8a07e7283682286d2b52c75

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