Merge remote-tracking branch 'origin/master'

fwq

2022-11-03 9811a61080777783e9d72e55c2a5cecad0439eeb

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java

 crm-platform-feign/src/main/java/com/hz/crm/dto/GoodsSkuDto.java

@@ -19,6 +19,8 @@
    private Integer isFilterGroup;
    /**是否团购商品,0否1是*/
    private Integer isGroup;
    //不可在HIS助手开单；1是；0否
    private Integer notPhisOrder;
    /**是否过滤积分商品:1过滤(不返回)积分商品,0不过滤返回*/
    private Integer isFilterIntegral;
}