Merge remote-tracking branch 'origin/master'

doum

23 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_service/src/main/java/com/doumee/dao/system/dto/PlatformConfigDTO.java

@@ -58,6 +58,7 @@
    private Integer integralInvalidCircle;
    @ApiModelProperty(value = "积分使用规则说明")
    private String integralRuleInfo;

    @ApiModelProperty(value = "字典code")
    private String dictCode;

}