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

44323

2024-01-24 3e0236dfc2cf6fca45c5e951a2cb0c722ba60b38

 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;