Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-28 bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3

 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;

}