Merge branch 'test' into 'master'

罗元桥

2021-08-05 37018ce6810f4855f43374f47cbd7b5e0d70d5a5

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

@@ -225,6 +225,9 @@
        }catch (ParseException e) {
                e.printStackTrace();
        }
        if (comSwRotaDO == null) {
            return R.fail(rotaDate + "值班表不存在");
        }
        List<ComSwRotaPersonVO> rotaPersons = new ArrayList<>();
        if (null != comSwRotaDO){
            String rotaPerson = comSwRotaDO.getRotaPerson();
@@ -252,6 +255,9 @@
        } catch (ParseException e) {
            e.printStackTrace();
        }
        if (comSwRotaDO == null) {
            return R.fail(rotaDate + "值班表不存在");
        }
        List<ComSwRotaPersonVO> rotaLeaders = new ArrayList<>();
        if (null != comSwRotaDO){
            String rotaPerson = comSwRotaDO.getRotaLeader();