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

zhanglin8526

2023-08-26 0af329d7210a84c97ec071735a2d0d1d7b0b785c

 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;