Merge branch 'master' into feature/订单服务单代码改造

姜友瑶

2022-05-23 ea865027c9e115057644f59747f3bed2a8a963e6

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java

@@ -455,5 +455,10 @@
    */
   private Integer validFlag;

   /**
    * Pad端查询条件
    */
   private String padQueryKey;


}