Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/mapper/OperateUserMapper.java

@@ -12,5 +12,5 @@


    Long findOperateUserCount();



    OperateUser findOperateUserById( @Param("id") int id);

    int deleteOperateUserList(@Param("ids") String[] ids);

}