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

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightIntegral.java

@@ -30,6 +30,9 @@
    @ApiModelProperty(value = "积分变动数量")
    private String integralNum="0";

    @ApiModelProperty(value = "商家id")
    private String merchantId;

    @ApiModelProperty(value = "变动备注")
    private String remark;