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

admin

2020-05-12 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackConfigServiceImpl.java

@@ -76,6 +76,11 @@
      if (StringUtil.isNullOrEmpty(record.getKey()))

         throw new RedPackConfigException(1, "标识不能为空");



      String remark = record.getRemark();

      if ("null".equalsIgnoreCase(remark)) {

         record.setRemark("");

      }

		
      record.setUpdateTime(new Date());

      if (record.getId() == null) {

         record.setCreateTime(new Date());