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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVipConfigServiceImpl.java

@@ -76,8 +76,16 @@
      if (StringUtil.isNullOrEmpty(record.getKey()))

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



		
      String remark = record.getRemark();

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

         record.setRemark("");

      }

		
		
      record.setUpdateTime(new Date());

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

         record.setStartTime(new Date());

         record.setCreateTime(new Date());

         userVipConfigMapper.insert(record);

      } else {