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

cjl

2023-07-10 90362d592d28927e5ab56f9b24f97d1f9089b50b

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