Merge remote-tracking branch 'origin/master'

rk

昨天 b53ce008646cc62e0a0f10f4743fb6a73a6ee8bb

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

@@ -61,5 +61,4 @@
    @ApiModelProperty(value = "字典code")
    private String dictCode;


}