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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

 fanli/src/main/java/com/yeshi/fanli/controller/admin/MessageController.java

@@ -11,7 +11,7 @@


import com.google.gson.Gson;

import com.yeshi.fanli.dto.msg.MsgCommonDTO;

import com.yeshi.fanli.exception.ConfigException;

import com.yeshi.fanli.exception.config.ConfigException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.msg.MsgConfigService;