Merge remote-tracking branch 'origin/dev' into cjl

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

 screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java

@@ -16,5 +16,9 @@
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    private  Date date;

    private String mac;

    private String type;


}