Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-06 215884a441b4e28fff1ddf5a41a354c38a47e284

 phis-feign/src/main/java/com/hz/his/dto/material/ConsumablesDto.java

File was renamed from phis-feign/src/main/java/com/hz/his/dto/material/Consumables.java
@@ -6,7 +6,7 @@
 * @Author 商品
 */
@Data
public class Consumables {
public class ConsumablesDto {

    /** 中文简称  */
    private String aliasCHS;