用户模块区分是否管理员身份，是否商户身份

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -42,7 +42,7 @@
         LEFT JOIN sys_tenant e ON a.tenant_id = e.tenant_id
         LEFT JOIN sys_user_grade g ON a.grade_id = g.grade_id
         LEFT JOIN sys_user_referee h ON a.user_id = h.user_id and h.deleted = 0
-        LEFT JOIN sys_merchant h ON a.merchant_id = h.merchant_id
+        LEFT JOIN sys_merchant i ON a.merchant_id = i.merchant_id
         <where>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}