Merge branch '20210204' into 20210223

smart-city-platform/src/main/java/com/bz/smart_city/entity/User.java

@@ -54,6 +54,8 @@ public class User implements Serializable {
 
     @ApiModelProperty("微信openid")
     private String openid;
+    @ApiModelProperty("一体化平台id")
+    private String uniqid;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间", position = 50, hidden = true)