Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-11-08 943c5905b7f4ff48c7ae87c41b41aeae854f8a20

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

@@ -15,6 +15,7 @@
    private  String code4;
    private  String code5;
    private  String code6;
    private  String season;

    private Map<String, ArrayList<String>> list;
}