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

haoban-manage3-service/src/main/resources/mapper/PendingTaskMapper.xml

@@ -246,10 +246,10 @@
         from tab_haoban_pending_task
         where enterprise_id = #{enterpriseId} and store_id =#{storeId}
         <if test="finishFlag != -1">
-            and finish_flag = #{finish_flag}
+            and finish_flag = #{finishFlag}
         </if>
         <if test="overdueFlag != -1">
-            and overdue_flag = #{overdue_flag}
+            and overdue_flag = #{overdueFlag}
         </if>
         <if test="clerkId != null">
             and clerk_id = #{clerkId}