Merge branch 'yibin' into test

101captain

2022-01-18 b22bc1a0d7931c9e91b96f1cd7c1c1855ff69ebf

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

@@ -58,6 +58,9 @@
            <if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != &quot;&quot;'>
                and u.nick_name like concat('%',#{pageFeedBackDTO.nickName},'%')
            </if>
            <if test='pageFeedBackDTO.areaCode != null and pageFeedBackDTO.areaCode.trim() != &quot;&quot;'>
                and c.area_code = #{pageFeedBackDTO.areaCode}
            </if>
        </where>
        order by f.create_at desc