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

jyy

2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536

 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;

   /**
    * 用户所在国家