Merge remote-tracking branch 'origin/main'

# Conflicts: # admin/src/api/pmcanteendemand.js
2 months ago · c01609ee38
parent 6ae7f187c5 e342998d80
commit c01609ee38
1 changed files with 0 additions and 12 deletions
--- a/admin/src/api/pmcanteendemand.js
+++ b/admin/src/api/pmcanteendemand.js
@ -96,18 +96,6 @@ export function pmcanteendemandBatchSaveApi(list) {
    })
 }
 // /**
 //  * pmcanteendemand批量编辑
 //  * @param list
 //  */
 // export function pmcanteendemandBatchUpdateApi(list) {
 //     return request({
 //         url: `autogencode/pmcanteendemand/batchUpdate`,
 //         method: 'POST',
 //         data: list
 //     })
 // }
 /**
 * pmcanteendemand列表