Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

7 天以前 21573e8e02dc47202ca3e1f7d4705795a09c1b60

 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;