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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

 screen-api/src/main/java/com/moral/api/pojo/vo/excel/DailyVo.java

@@ -15,4 +15,9 @@

    private List<String> images;


    private String type;

    private  String name;

}