Merge pull request !704 from Aurora/master

Merge pull request !700 from Nymph2333/N/A

Merge pull request !699 from bell/N/A

Merge pull request !695 from 绿色心情/icon-select

This method propagates any exception thrown by the nullary constructor, including a checked exception. Use of this method effectively bypasses the compile-time exception checking that would otherwise be performed by the compiler. The Constructor.newInstance method avoids this problem by wrapping any exception thrown by the constructor in a (checked) InvocationTargetException.
The call
 clazz.newInstance()
can be replaced by
 clazz.getDeclaredConstructor().newInstance()
The latter sequence of calls is inferred to be able to throw the additional exception types InvocationTargetException and NoSuchMethodException. Both of these exception types are subclasses of ReflectiveOperationException.
Signed-off-by: Nymph2333 <498092988@qq.com>

Signed-off-by: Nbell <bellaconly@qq.com>

Merge pull request !686 from wzy1024/wzy1024

Merge pull request !683 from 也曾为你像超人/N/A

Merge pull request !682 from baozhigang/column-comment

Merge pull request !681 from Jimi/master

Merge pull request !676 from 也曾为你像超人/master

导出Excel，@Excel注解使用dictType属性时，如果有大量的字典数据，就会有大量的查询redis(打开、关闭)，导致特别慢。于是使用map存储字典数据，相同的key就不需要再次去查询redis，大大提高了导出效率。

Signed-off-by: 也曾为你像超人 <1553592282@qq.com>

Merge pull request !673 from Giovanni/master

Merge pull request !671 from 也曾为你像超人/master

Merge pull request !670 from 也曾为你像超人/N/A

Merge pull request !669 from 0慕容雪0/master

Signed-off-by: 0慕容雪0 <ytu.mxh@163.com>

Signed-off-by: 也曾为你像超人 <1553592282@qq.com>

DataScopeAspect,数据权限切面处理类中，用户多角色情况下，若所有角色都不包含传递过来的权限字符，这个时候sqlString也会为空，会导致用户拥有全部数据权限，所以要限制一下, 可以根据conditions集合是否为空，来判断循环时所有角色是否都是在判断权限字符时continue了。
复现方法: 在使用@DataScope注解时permission定义了值,这个值所有角色不包含。
Signed-off-by: 0慕容雪0 <ytu.mxh@163.com>