Merge branch 'test' into 'master'

罗元桥

2021-07-26 021354080a0cc677e1483c7fd44dd6d6487c0321

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberWarnLogMapper.java

@@ -38,4 +38,6 @@
     */
    IPage<EventGridMemberWarnLogAdminVO> gridMemberWorkWarning(Page page, @Param("gridMemberWainDTO") EventGridMemberWainDTO gridMemberWainDTO);

    void setUserWorkStatus(@Param("userId") Long userId,@Param("workStatus") Integer workStatus);

}