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

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductQueryV2Criteria.java

@@ -32,6 +32,8 @@ import static cn.ysk.cashier.annotation.Query.Type.*;
 **/
 @Data
 public class TbProductQueryV2Criteria {
+    @Query
+    private Integer id;
 
     /** 精确 */
     @Query
@@ -67,9 +69,9 @@ public class TbProductQueryV2Criteria {
     @Query(type = BETWEEN)
     private List<Long> createdAt;
 
-//    private Integer page;
-//
-//    private Integer size;
+    private Integer page;
+    private Integer size;
+    private String sort;
 
     public void setType(String type) {
         if(StringUtils.isNotBlank(type)){