Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_c...

liujie

2025-12-31 1e1824468b2e22952c6187be1ceb5170adba2ab8

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community

 ruoyi-admin/src/main/resources/application.yml

@@ -1,4 +1,4 @@
# 项目相关配置
spring:
  profiles:
    active: test
    active: prod

 ruoyi-system/src/main/resources/mapper/system/TInsuranceOrderMapper.xml

@@ -106,7 +106,7 @@
                AND tio.end_time >= #{query.startTime}
                AND tio.end_time <= #{query.endTime}
            </if>
            AND tio.refund_status = 1
            AND tio.refund_status != 0
            AND tio.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY tio.create_time DESC
@@ -172,7 +172,7 @@
                AND tio.end_time &gt;= #{query.startTime}
                AND tio.end_time &lt;= #{query.endTime}
            </if>
            AND tio.refund_status = 1
            AND tio.refund_status != 0
            AND tio.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY tio.create_time DESC