Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-14 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129

 flower_city/src/main/java/com/dg/core/db/gen/mapper/AutomessageSysUserRecordMapper.java

@@ -40,4 +40,10 @@
     */
    List<AppletUserCount> selectByYear();

    /**
     * 删除因为token问题产出的重复脏数据
     * @return
     */
    Integer deleteDistinct();

}