Commit e4b3b937 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents d38a68db 7812ba40
...@@ -563,7 +563,7 @@ public class SocialFriendConfig { ...@@ -563,7 +563,7 @@ public class SocialFriendConfig {
ybjyclArr.addAll(vo.getImgListYsd()); ybjyclArr.addAll(vo.getImgListYsd());
} }
tszdxx.put("ybjycl", ybjyclArr); tszdxx.put("ybjycl", ybjyclArr);
if (type == 4 && "16".equals(vo.getTbyy())) { if (type == 4 && "死亡".equals(vo.getTbyy())) {
// 生存状态变更类型 // 生存状态变更类型
tszdxx.put("scztbglx", "死亡"); tszdxx.put("scztbglx", "死亡");
// 生存状态变更原因 // 生存状态变更原因
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment