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

base-module/src/main/java/com/caimei/module/base/entity/po/Product.java

@@ -495,7 +495,7 @@ public class Product implements Serializable {
     private Date downlineTime;
 
     /**
-     * 是否包邮 0包邮 1不包邮
+     * 是否包邮 0包邮 1到付
      */
     private String freePostFlag;
 

base-module/src/main/java/com/caimei/module/base/entity/po/User.java

@@ -59,6 +59,11 @@ public class User implements Serializable {
      */
     private String realName;
 
+    /**
+     * 注册来源: 0网站 1小程序
+     */
+    private String source;
+
     /**
      * 头像
      */