Merge branch 'test' into 'master'

罗元桥

2021-06-29 cd7bec2448443f88eee6f73df68df829fc95eed9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java

@@ -313,10 +313,10 @@
            DateTime endDay = DateUtil.endOfMonth(date);

            int m = DateUtil.month(endDay);
//            if(m == 0){
//                m = 12;
//            }
//            m--;
            m++;
            if(m == 12){
                m = 0;
            }
            int day = DateUtil.dayOfMonth(endDay);
            int half = day/2;
            String month = DateUtil.format(date,moth_format_str);
@@ -334,6 +334,5 @@
        return dateList;

    }


}