Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightProjectPlanService.java

@@ -18,10 +18,12 @@

    NewFightProjectPlanDTO getDetails(String id);

    R editProjectPlanAccomplish(String id);

    R addData(NewFightProjectPlanDTO item);

    R editData(NewFightProjectPlanDTO item);

    R expurgateData(String id);
    R expurgateData(String id,String projectId);

}