Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-08 d6e902a48df4264d6dbf6ff0c9799c3c30c9d9ff

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

@@ -261,7 +261,7 @@
   /**
    * 性别 1、男  2、女  0、未知
    */
   private String  gender;
   private Integer  gender;

   /**
    * 用户所在国家