Merge remote-tracking branch 'origin/dev' into dev

app-退料接收
2023-12-24 00:46:19 +08:00 · 2023-12-24 00:46:08 +08:00
1 changed files with 8 additions and 2 deletions
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@ -361,8 +361,8 @@
    <if test="scrapNum != null">
      #{scrapNum},
    </if>
-    <if test="scrapNum != null">
-      #{scrapNum},
+    <if test="status != null">
+      #{status},
    </if>
    <if test="createBy != null and createBy != ''">
      #{createBy},
@ -377,6 +377,12 @@
    <if test="companyId != null">
      #{companyId},
    </if>
+    <if test="backId != null">
+      #{backId},
+    </if>
+    <if test="repairer != null">
+      #{repairer},
+    </if>
    NOW()
    )
  </insert>
Author	SHA1	Message	Date
bns_han	d5a90a5b64	Merge remote-tracking branch 'origin/dev' into dev	2023-12-24 00:46:19 +08:00
bns_han	69097feb30	app-退料接收	2023-12-24 00:46:08 +08:00