Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmQrcodeMapper.java

@@ -147,7 +147,6 @@ public interface TabHaobanHmQrcodeMapper {
      */
     TabHaobanHmQrcode queryByClerkIdAndOverFlag(@Param("clerkId") String clerkId,
                                                 @Param("wxEnterpriseId") String wxEnterpriseId,
-                                                @Param("overFlag") Integer overFlag,
                                                 @Param("hmType") Integer hmType);
 
     /**

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

@@ -123,7 +123,7 @@ public interface HmQrcodeService {
      * @author mozhu
      * @date 2022-07-27 14:52:40
      */
-    HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer overFlag,Integer hmType);
+    HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer hmType);
 
 
     /**

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

@@ -109,9 +109,9 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
     }
 
     @Override
-    public HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer overFlag, Integer hmType) {
+    public HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId,  Integer hmType) {
         return EntityUtil.changeEntity(HmQrcodeBO.class,
-                tabHaobanHmQrcodeMapper.queryByClerkIdAndOverFlag(clerkId, wxEnterpriseId, overFlag, hmType));
+                tabHaobanHmQrcodeMapper.queryByClerkIdAndOverFlag(clerkId, wxEnterpriseId,  hmType));
     }
 
     @Override

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml

@@ -311,7 +311,6 @@
         from tab_haoban_hm_qrcode
         where clerk_id = #{clerkId} and status_flag = 1
         and wx_enterprise_id = #{wxEnterpriseId}
-        and over_flag = #{overFlag}
         <if test="hmType != null">
             and hm_type = #{hmType}
         </if>