Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-13 ad1f4f786436a8a7d9d9b4e0f2df243c1768581d

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

@@ -85,6 +85,8 @@
    @TableField("two_audit_time")
    private LocalDateTime twoAuditTime;


    @ApiModelProperty(value = "父级id  上一次已审核通过的id  为空则代表是新增，或者本次数据状态审核中或已拒绝")
    @TableField("parent_id")
    private Integer parentId;

}