1、获取关注、粉丝列表、消息详细 返回参数统一

2、管理员系统 按用户名或用户邮箱 查询用户design频率

src/main/resources/mapper/primary/DesignMapper.xml

@@ -39,6 +39,12 @@
         </where>
         and b.create_date not like '%:01'
         and b.create_date not like '%:02'
+        <if test="userName != null and userName != '' ">
+            and a.user_name = #{userName}
+        </if>
+        <if test="email != null and email != '' ">
+            and a.user_email = #{email}
+        </if>
         GROUP BY b.account_id
         ORDER BY b.account_id asc) d
         left join trial_order c on d.user_email = c.email