Merge remote-tracking branch 'origin/master'

doum

2 天以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java

@@ -87,6 +87,9 @@
    @ApiModelProperty(value = "法人电话")
    @ExcelColumn(name="法人电话")
    private String legalPersonPhone;
    @ApiModelProperty(value = "微信openId")
    @ExcelColumn(name="微信openId")
    private String openId;

    @ApiModelProperty(value = "身份证反面照")
    @ExcelColumn(name="身份证反面照")
@@ -123,7 +126,7 @@
    @ExcelColumn(name="积分累计")
    private BigDecimal totalIntegral;

    @ApiModelProperty(value = "可提成金额")
    @ApiModelProperty(value = "可提现金额")
    @ExcelColumn(name="可提成金额")
    private BigDecimal amount;