Merge remote-tracking branch 'origin/div' into div

admin

2019-08-20 4fb3f5e033c38afda6e7db013c53389732591efd

 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();