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

chenjiahe

2024-04-02 ec682512c4c9bc85ffd35f254d8d3a0c8ed46291

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