Merge remote-tracking branch 'origin/master'

mitao

2024-06-03 a6508a543e3727eb527db5feec9ac7155e88f599

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CouponMember.java

File was renamed from ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/CouponMember.java
@@ -1,4 +1,4 @@
package com.ruoyi.promotion.domain;
package com.ruoyi.system.api.domain;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;