fixed

liangliang1259 · liangliang1259 · commit 0d1a9e6795e4 · 2018-01-05T10:44:25.000+08:00
diff --git a/thoth-robot-ms/thoth-robot-entity/src/main/java/com/prometheus/thoth/robot/entity/Industry.java b/thoth-robot-ms/thoth-robot-entity/src/main/java/com/prometheus/thoth/robot/entity/Industry.java
@@ -0,0 +1,22 @@
+package com.prometheus.thoth.robot.entity;
+
+public class Industry {
+    private Integer id;
+    private String name;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/thoth-robot-ms/thoth-robot-service/src/main/java/com/prometheus/thoth/robot/service/impl/RobotServiceImpl.java b/thoth-robot-ms/thoth-robot-service/src/main/java/com/prometheus/thoth/robot/service/impl/RobotServiceImpl.java
@@ -143,9 +143,12 @@ public List<Robot> listAll() {
 	@Override
 	public List<Robot> listAll(Robot robot) {
 		List<Robot> robots = robotMapper.listRobots(robot);
+		Robot robot1 = new Robot();
+		robot1.setName("哈哈哈哈");
 		if (robots == null){
 			robots = new ArrayList<Robot>();
 		}
+		robots.add(robot1);
 		return robots;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,12 @@ public List<Robot> listAll() {`
`143`	`143`	`@Override`
`144`	`144`	`public List<Robot> listAll(Robot robot) {`
`145`	`145`	`List<Robot> robots = robotMapper.listRobots(robot);`
	`146`	`+ Robot robot1 = new Robot();`
	`147`	`+ robot1.setName("哈哈哈哈");`
`146`	`148`	`if (robots == null){`
`147`	`149`	`robots = new ArrayList<Robot>();`
`148`	`150`	`}`
	`151`	`+ robots.add(robot1);`
`149`	`152`	`return robots;`
`150`	`153`	`}`
`151`	`154`