Merge branch 'master' into xin

xin

6 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 oying-system/src/main/java/com/oying/modules/message/domain/dto/MessageOrderSellerDTO.java

@@ -8,10 +8,13 @@

@Data
public class MessageOrderSellerDTO {
    //加一个主键

    private Integer id;

    private Integer orderId;

    private String messageType;
//    private String messageType;

    private String messageContent;