解决冲突

mitao

2025-02-24 879ce4e66b36daf44f79b17eb02d3578148e4545

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/ComplaintProgress.java

@@ -36,8 +36,8 @@
    private Long id;

    @ApiModelProperty(value = "诉求id")
    @TableField("issue_report_id")
    private Long issueReportId;
    @TableField("complaint_id")
    private Long complaintId;

    @ApiModelProperty(value = "办理进度描述")
    @TableField("describe")
@@ -59,5 +59,9 @@
    @TableField("create_by")
    private Long createBy;

    @ApiModelProperty(value = "创建人")
    @TableField("create_by_name")
    private String createByName;


}