Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -141,16 +141,24 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "呼叫人")
     private String callUser;
 
+    @Transient
+    @ApiParam(value = "呼叫人名字")
+    private String callUserName;
+
     @Column(name = "CONFIRM_USER")
     @ApiParam(value = "响应人")
     private String confirmUser;
 
+    @Transient
+    @ApiParam(value = "响应人名字")
+    private String confirmUserName;
+
     @Column(name = "RESET_USER")
     @ApiParam(value = "解决人")
     private String resetUser;
 
     @Transient
-    @ApiParam(value = "异常时长")
+    @ApiParam(value = "解决人名字")
     private String resetUserName;
 
     @Column(name = "IS_SHIFT_CALL")