Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-14 0a46169a5fdd1bfec692500d2509e2bf1a21d5e0

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java

@@ -148,6 +148,9 @@
    @TableField(exist = false)
    private List<AppUser> appUserList;

    @TableField(exist = false)
    private String phone;


    public String getIdStr(){
        return String.valueOf(id);