Merge remote-tracking branch 'origin/zypms' into zypms

mrzhssss

2022-09-06 8745b76acfd45eadd720d7ce6d87c77e6e0682b9

 src/main/resources/mapper/ProjectTypeMapper.xml

@@ -12,6 +12,7 @@
        <result column="str_1" property="str1" />
        <result column="str_2" property="str2" />
        <result column="str_3" property="str3" />
        <result column="is_asrs" property="isAsrs" />

    </resultMap>