Browse Source

Merge pull request #1452 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0

* commit 'acbcffd977362a37a673b56843bcf5120a87d13a':
  无任务,编译失败
feature/big-screen
yaoh.wu 5 years ago
parent
commit
a7a2c41275
  1. 4
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java

4
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java

@ -50,7 +50,7 @@ public class RobotModel extends AlphaCellModel {
try { try {
String result = HttpToolbox.get(url); String result = HttpToolbox.get(url);
if(StringUtils.isEmpty(result)){ if (StringUtils.isEmpty(result)) {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
JSONObject jsonObject = new JSONObject(result); JSONObject jsonObject = new JSONObject(result);
@ -94,7 +94,7 @@ public class RobotModel extends AlphaCellModel {
@Override @Override
public final boolean equals(Object obj) { public final boolean equals(Object obj) {
return obj instanceof RobotModel return obj instanceof RobotModel
&& AssistUtils.equals(this.title, ((RobotModel)obj).title) && AssistUtils.equals(this.title, ((RobotModel) obj).title)
&& AssistUtils.equals(this.content, ((RobotModel) obj).content); && AssistUtils.equals(this.content, ((RobotModel) obj).content);
} }

Loading…
Cancel
Save