Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java

@@ -31,7 +31,7 @@ public interface TbConsInfoFlowRepository extends JpaRepository<TbConsInfoFlow,
             "where flow.shopId = :shopId " +
             "AND flow.createTime > :startTime " +
             "AND flow.createTime < :endTime " +
-            "AND flow.bizName IN :types " +
+            "AND flow.bizCode IN :types " +
             "ORDER BY flow.id DESC")
     Page<TbConsInfoFlow> findByConsParam(Integer shopId, Integer consId, String conName, Integer conTypeId, List<String> types,
                                          Date startTime, Date endTime, Pageable pageable);