Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-07-23 774cb0ede0572062f025132a5c2a0262188abf05

 gc-user/src/main/java/com/xzx/gc/user/vo/UserHeadInfoVo.java

@@ -19,9 +19,15 @@
    @ApiModelProperty(value="绑定时间")
    private String createTime;

    @ApiModelProperty(value="累计金额")
    @ApiModelProperty(value="累计金额收益")
    private BigDecimal amount;

    @ApiModelProperty(value="累计积分收益")
    private BigDecimal score;

    @ApiModelProperty(value="累计积分")
    private BigDecimal orderScore;

    @ApiModelProperty(value="累计单数")
    private Integer orderCnt;