Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-11 eb6d41359a8957c6355275f7697db202d6a523db

 screen-api/src/main/resources/mapper/SupervisionMapper.xml

@@ -5,6 +5,7 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.moral.api.entity.Supervision">
        <id column="id" property="id"/>
        <result column="organization_id" property="organizationId"/>
        <result column="city_code" property="cityCode"/>
        <result column="city_name" property="cityName"/>
        <result column="time" property="time"/>