Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-08-04 b5a2fc07527ab700544f3b7ba0be01b2e015e2db

 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"/>