Merge remote-tracking branch 'origin/master'

zengh

2022-02-21 7722aa86f1a0e2aacbf2fd17203789619e1c64e3

 src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java

@@ -41,4 +41,5 @@
    */
   List<IntegralVO> selectIntegralPage(IPage page, IntegralVO integral);
   List<Map<Object, Object>> selectCount(String uid);
   List<Map<Object, Object>> selectList(String uid,String type);
}