Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-29 278f61f89b8282784c6f3572605ef5e62dc74f59

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java

@@ -37,13 +37,14 @@
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "停车场名称")
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "车牌号")
    @TableField("license_plate")
    private String licensePlate;
    
    @TableField("name")
    private String name;
    

    @TableField(exist = false)
    private String uid;