Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 2384c489bc788ee60d49a1a07bb8059f4a15352a

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

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

            int m = DateUtil.month(endDay);
            if(m == 0){
                m = 12;
            }
            m--;
            int day = DateUtil.dayOfMonth(endDay);
            int half = day/2;
            String month = DateUtil.format(date,moth_format_str);