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

huliguo

4 天以前 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyCodeVo.java

@@ -1,6 +1,5 @@
package com.ruoyi.order.domain.vo;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;