Merge remote-tracking branch 'origin/master'

zengh

2022-07-09 d48d6e9bb0bb48f8338798d8a2cba60396e16698

 src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java

@@ -39,6 +39,8 @@
    * @return
    */
   List<SaleVO> selectSalePage(IPage page, SaleVO sale);
   Map<String, String> selctSaletCount(String year);
   Map<String, String> selctSaletCount();
   List<Map<Object,String>> selctSaletZ();
   List<Map<Object,String>> selectMarketCirculate();
   List<Map<Object,String>> selectMarketDistrict();
}