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

Pu Zhibing

5 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtShopConfigEditDto.java

@@ -14,6 +14,9 @@
@Data
public class MgtShopConfigEditDto extends MgtBaseDto {

    @ApiModelProperty(value = "商户统一分成比例")
    private String shopCommonProportion;

    @ApiModelProperty(value = "合作商任务紧急程度")
    private String shopEmergencyDegree;