Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-10 18e68871f0423910f748a727ceab297a8e4765d1

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/VerifiableShopVo.java

File was renamed from ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/VerifiableShopVo.java
@@ -1,4 +1,4 @@
package com.ruoyi.other.vo;
package com.ruoyi.order.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;