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

zxl

5 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

 framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java

@@ -24,6 +24,9 @@
    @ApiModelProperty(value = "用户手机号码")
    private String mobile;

    @ApiModelProperty(value = "会员ID")
    private String memberId;

    /**
     * @see SwitchEnum
     */