Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-17 b69d2017fecdad6a1c9a09c0006e70ecea9efed0

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

@@ -42,6 +42,7 @@
     /**
     * 部门电话
     */
     @TableField(exist = false)
    @ApiModelProperty("部门电话")
    private String contactNumber;