Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-01 eed54c262df12dd3d132bf14691915e6183afd4c

 fanli/src/main/java/com/yeshi/fanli/util/ShamHongBaoUtil.java

@@ -56,7 +56,7 @@
            if (cell.getContents() == null || "".equals(cell.getContents().trim())) {

               continue;

            }

            shamUserService.delete(Long.parseLong(cell.getContents()));

            shamUserService.deleteByPrimaryKey(Long.parseLong(cell.getContents()));

         }

      } catch (BiffException e) {

         e.printStackTrace();