Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

14 小时以前 9b362b55344d0c854355eb2db1de84219b53a77e

 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;