Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
wangxin
2018-08-20 10:16:35 +08:00
3 changed files with 22 additions and 4 deletions

View File

@@ -247,7 +247,7 @@ public class FileTransferCfgController extends BaseController{
if(StringUtils.isNotBlank(ids)){
entity = fileTransferCfgService.getP2pCfg(Long.parseLong(ids));
// 添加配置域Key,用于新增页面判断
// 添加配置域Key,用于修改页面区分各域配置
P2pHashCfg hashCfg = new P2pHashCfg();
hashCfg.setCfgType(Constants.P2P_HASH_BIN_REGION);
entity.setP2pHash(hashCfg);
@@ -270,7 +270,7 @@ public class FileTransferCfgController extends BaseController{
initUpdateFormCondition(model,entity);
}else{
// 添加配置域Key,用于修改页面判断
// 添加配置域Key,用于新增页面区分各域配置
P2pHashCfg hashCfg = new P2pHashCfg();
hashCfg.setCfgType(Constants.P2P_HASH_BIN_REGION);
entity.setP2pHash(hashCfg);