Merge branch 'dev/20200513end_1.2.0' into debug

src/main/resources/mapper/SysUserMapper.xml

@@ -96,7 +96,7 @@
                 t8.is_deleted = 'N'
                 AND t9.is_deleted = 'N'
                 AND t8.role_id = t9.id
-                AND t8.role_id ！= -1
+                AND t8.role_id != -1
                 AND t8.role_id = #{roleId}
                 GROUP BY
                 t8.user_id
@@ -113,7 +113,7 @@
                 WHERE
                 t8.is_deleted = 'N'
                 AND t9.is_deleted = 'N'
-                AND t8.role_id ！= -1
+                AND t8.role_id != -1
                 AND t8.role_id = t9.id
                 GROUP BY
                 t8.user_id