Merge remote-tracking branch 'origin/master'

于杰

2025-07-25 9d80c05bdbc18b4d7778828d411deb9b603f6a4b

 north-glass-erp/src/main/java/com/example/erp/entity/pp/WorkprogressMonthlySettlement.java

@@ -1,7 +1,9 @@
package com.example.erp.entity.pp;

import java.time.LocalDate;
import lombok.Data;

import java.time.LocalDate;
@Data
public class WorkprogressMonthlySettlement {
    //自增ID
    private Integer id;