Merge branch 'test_future_wangge' into test

CeDo

2021-06-08 d4b9ab5678abe6835e26d8984a5c10dbb6092f30

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

}