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

huanghongfa

2022-04-13 7335fc82791bdc7f71aa4fe9765045b8d476e9cd

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -195,6 +195,8 @@

    @ApiModelProperty("是否微团队成员 1.是 2.否")
    private Integer isFmsMember;
    @ApiModelProperty("是否网格员 1.是 2.否")
    private Integer isEasyPhotoMember;

    @ApiModelProperty("appid")
    private String appId;