Merge remote-tracking branch 'origin/2.3' into 2.3

longz

2026-09-29 0ca3a3922d2d25df52682b2290be15135cce100e

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserWhitelist.java

@@ -63,6 +63,10 @@
    @TableField("balance")
    private java.math.BigDecimal balance;

    @ApiModelProperty(value = "锁定额度（元）：充电申请时锁定，结算时解锁并按实际消费扣减")
    @TableField("locked_amount")
    private java.math.BigDecimal lockedAmount;

    @ApiModelProperty(value = "所属公司名称（列表远程回填，不落库）")
    @TableField(exist = false)
    private String companyName;