Merge remote-tracking branch 'origin/master-test' into master-test

fhx

2024-05-31 c73425451381d5338de8a47253bae007eddc7c8f

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