Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang

xuhy

2025-02-13 c439bf5bc781ae0aedf4dc0d4abf6d0d48417a8f

Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang


 Conflicts:

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java

@@ -3,6 +3,8 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.constant.AmountConstant;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;