合并冲突

licp

2024-05-10 3a4041f3eef38f38fa03d6305bea9faead06c133

 src/assets/api/controller.js

@@ -24,6 +24,7 @@
    informationNotification,
    performanceShift,
    auxiliaryWorkingHours,
     unPass,
   }
}

@@ -271,3 +272,6 @@
  insertAuxiliaryWorkingHours:"/auxiliaryWorkingHours/insertAuxiliaryWorkingHours",//新增辅助工时
}

const unPass = {
   pageInsUnPass:"/unPass/pageInsUnPass", // 查询不合格样品数据
}