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

lidongdong

2022-11-30 78ab8a882cb5e9d1c09927abdddd4a4b2e27f359

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml

@@ -117,5 +117,8 @@
    <select id="selectStoreIdIdByUserId" resultType="java.lang.Long">
        select id from com_convenient_merchants where user_id  = #{userId} and is_del = 0
    </select>
    <select id="selectStreetByAreaCodeStr" resultType="com.panzhihua.common.model.vos.user.StreetVOStr">
        select street_id as id,name as name from com_street where area_code=#{code} and app_id ='wx118de8a734d269f0'
    </select>

</mapper>