解决冲突

MrShi

2026-04-02 a29e0df3c165dfe2ddd825bb340ed480a64865db

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwPatrolTaskService.java

@@ -95,4 +95,6 @@
     * @return long
     */
    long count(YwPatrolTask ywPatrolTask);

    void taskCancel(Integer id, LoginUserInfo loginUserInfo);
}