Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmClerkRelationDTO.java

@@ -45,7 +45,8 @@ public class HmClerkRelationDTO implements Serializable {
      * 是否上限1是0否
      */
     private Integer overFlag;
-
+    private String staffId;
+    private String staffName;
 
     public Long getRelationId() {
         return relationId;
@@ -167,5 +168,20 @@ public class HmClerkRelationDTO implements Serializable {
         this.overFlag = overFlag;
     }
 
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmClerkRelationBO.java

@@ -45,6 +45,8 @@ public class HmClerkRelationBO implements Serializable {
      * 是否上限1是0否
      */
     private Integer overFlag;
+    private String staffId;
+    private String staffName;
 
 
     public Long getRelationId() {
@@ -167,5 +169,20 @@ public class HmClerkRelationBO implements Serializable {
         this.overFlag = overFlag;
     }
 
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java

@@ -271,8 +271,8 @@ public class HmQrcodeController {
         }
         Integer hmType = hmQrcodeDTO.getHmType();
         Page page = new Page();
-        List<HmDetailClerkListVO> list = new ArrayList<>();
         if (hmType == 1) {
+            List<HmDetailClerkListVO> list = new ArrayList<>();
             HmDetailClerkListVO hmDetailClerkListVO = EntityUtil.changeEntityNew(HmDetailClerkListVO.class, hmQrcodeDTO);
             list.add(hmDetailClerkListVO);
             page.setResult(list);