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

无关风月

2025-09-01 324ed9fac852bc4117ee0da65a586adef258bd52

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

@@ -60,7 +60,7 @@
    @TableField(exist = false)
    private String siteName;

    @ApiModelProperty(value = "合作商id", required = true)
    @ApiModelProperty(value = "合作商id")
    @TableField("partner_id")
    private Integer partnerId;