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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserRuleVO.java

@@ -4,8 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@ApiModel("小程序-社区领取积分列表")
public class ComActIntegralUserRuleVO {
@@ -30,10 +28,11 @@
    private String remark;
    @ApiModelProperty("是否已完成（1.是 2.否）")
    private Integer isComplete;

    /**
     * 是否已完成（1.是 2.否）
     */
    public interface isComplete{
    public interface isComplete {
        int yes = 1;
        int no = 2;
    }