Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-11-17 9772cfdb668bdb19b2fe342978d9b37ddbdb9558

 ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml

@@ -21,7 +21,7 @@
        SELECT
        t2.category,
        t2.event_source,
        t2.id as baseId,
        t2.code as code,
        t1.id,
        t3.region_name,
        t1.create_time,