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/HmQrcodeListDTO.java

@@ -25,6 +25,7 @@ public class HmQrcodeListDTO implements Serializable {
     private String enterpriseId;
 
     private String name;
+    private String hmName;
 
     private String creatorId;
 
@@ -328,4 +329,12 @@ public class HmQrcodeListDTO implements Serializable {
     public void setHmGroupName(String hmGroupName) {
         this.hmGroupName = hmGroupName;
     }
+
+    public String getHmName() {
+        return hmName;
+    }
+
+    public void setHmName(String hmName) {
+        this.hmName = hmName;
+    }
 }