Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml

@@ -411,7 +411,7 @@
     <select id="queryOpmArticlesPaged" resultType="org.rcisoft.business.memInfo.entity.opmArticleDTO">
         select
             a.create_date as createDate,
-            u.name as createUser,
+            u.nick_name as createUser,
             t.topic_name as topic,
             a.business_id as businessId
         from opm_article a