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

huliguo

11 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtTerminateCooperationDto.java

@@ -19,7 +19,7 @@
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty("合作状态0终止1开启")
    @ApiModelProperty(value="合作状态0终止1开启")
    private Integer cooperativeFlag;

}