Merge branch 'dev' into test-sso

# Conflicts: # sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java
2024-01-30 16:29:17 +08:00 · 2024-01-30 16:29:17 +08:00 · be66d0b7a1
parent 7fd7793893 586728fae3
commit be66d0b7a1
1 changed files with 10 additions and 0 deletions
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java
@ -71,8 +71,18 @@ public interface PurchaseCheckInfoMapper
     */
    String selectTypeNameByTaskId(Long taskId);

+    /**
+     * 插入
+     * @param bmNoticeInfo
+     * @return
+     */
    int insertBmNoticeInfo(BmNoticeInfo bmNoticeInfo);

+    /**
+     *
+     * @param purchaseCheckInfo
+     * @return
+     */
    List<PurchaseCheckInfo> selectPutInListList(PurchaseCheckInfo purchaseCheckInfo);

    /**