Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 2d28d91d6ca70f8b60a24f6807ff1a2d1e117eb2

 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -15,6 +16,7 @@

@ApiModel("导办事项管理实体类")
@Data
@TableName("automessage_transaction_event")
public class TransactionEvent implements Serializable
{
    /**
@@ -253,7 +255,11 @@



    @ApiModelProperty(name = "operationalGuidelineVideoName", value = "操作指南视频名称")
    private String  operationalGuidelineVideoName;

    @ApiModelProperty(name = "operationalGuidelineName", value = "操作指南名称")
    private  String  operationalGuidelineName;