Merge branch 'master' into developer

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

@@ -60,6 +60,10 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
         hmQrcodeQDTO.setOverFlag(0);
         hmQrcodeQDTO.setAddNum(0);
         hmQrcodeQDTO.setStatusFlag(1);
+        Integer hmUserNum = hmQrcodeQDTO.getHmUserNum();
+        if (hmUserNum == null) {
+            hmQrcodeQDTO.setHmUserNum(1);
+        }
         return this.tabHaobanHmQrcodeMapper.insert(EntityUtil.changeEntity(TabHaobanHmQrcode.class, hmQrcodeQDTO));
     }