Merge branch 'master-prod-new' into fhx-prod-CRM预约

fhx

2024-03-29 90e042d607b578a130d567819664ec5b5ff6bc67

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