Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-08-25 1267661c4028d4adb6629b3c6f00c686aa35eb8a

 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;
}