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

@@ -255,7 +255,11 @@



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

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