Merge remote-tracking branch 'origin/master'

wzh

2022-08-10 54a6617f944e072a62bc90c54772a68003fb98fc

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

@@ -12,5 +12,10 @@
public class ActivityDto extends PageDto {
    /**门店标识 */
    private String shopId;
    /**团购商品类型标识 */
    private String typeId;
    /**团购活动标识 */
    private String groupBuyId;


}