Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-31 9b583c3ae9f78328368b2eda8899f80204ed796f

 src/main/java/org/springblade/modules/social/service/ISocialService.java

@@ -48,4 +48,5 @@
    * @return
    */
   void importUser(List<SocialExcel> data, Boolean isCovered,String deptid);
   void upSoil(String cardid);
}