Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-05 cac51e7aacded53a855a65d02ea6c57305ea15fe

 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;