Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConvenientMerchant.java

@@ -91,6 +91,9 @@
    @ApiModelProperty("社区id")
    private String communityId;

    @ApiModelProperty("绑定用户")
    private String userId;