Merge remote-tracking branch 'origin/master'

fwq

2022-08-12 c38dce7eb2c94df58bee59780fe839eff5976316

 phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java

@@ -13,7 +13,7 @@
    /**门店标识 */
    private String shopId;
    /**团购商品类型标识 */
    private String typeId;
    private String goodsTypeId;
    /**团购活动标识 */
    private String groupBuyId;