Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityActivityDto.java

@@ -129,5 +129,14 @@
    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "是否是查询自己参与的活动(1.是 2.否)")
    private Integer isUser = 2;

    @ApiModelProperty(value = "是否是小程序(1.是 2.否)")
    private Integer isApplets;

}