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/qdto/hm/HmQrcodeQDTO.java

@@ -96,6 +96,10 @@ public class HmQrcodeQDTO implements Serializable {
     private List<String> clerkIdList;
     private String staffId;
     private String staffName;
+    /**
+     * 调用类型，1：手动调用；2：系统调用；3：批量调用
+     */
+    private Integer invokingType;
 
 
     public Long getHmId() {
@@ -353,5 +357,13 @@ public class HmQrcodeQDTO implements Serializable {
     public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
+
+    public Integer getInvokingType() {
+        return invokingType;
+    }
+
+    public void setInvokingType(Integer invokingType) {
+        this.invokingType = invokingType;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java

@@ -188,6 +188,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         }
         for (String clerkId : clerkIdList) {
             hmQrcodeQDTO.setClerkIdList(Collections.singletonList(clerkId));
+            hmQrcodeQDTO.setInvokingType(3);
             add(hmQrcodeQDTO);
         }
         setLoggerContext(enterpriseId, wxEnterpriseId, hmQrcodeQDTO.getCreatorId(), hmQrcodeQDTO.getCreatorName());