Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-08 5e88359d7210039a6b1525bd5ffc20f24f2b5e01

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