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

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -159,4 +159,11 @@ public class UdiRelevanceSaveRequest {
     private String payFeeCode;
 
     private Integer requireScanCode;
+
+    private String distributeLevelDi;
+    private String distributeLevelUnit;
+    private Integer distributeLevelCount;
+    private String useLevelDi;
+    private String useLevelUnit;
+    private Integer useLeverCount;
 }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1477,6 +1477,25 @@
             <if test="splitEnable != null">
                 splitEnable=#{splitEnable},
             </if>
+            <if test="distributeLevelDi != '' and distributeLevelDi != null">
+                distributeLevelDi=#{distributeLevelDi},
+            </if>
+            <if test="distributeLevelUnit != '' and distributeLevelUnit != null">
+                distributeLevelUnit=#{distributeLevelUnit},
+            </if>
+            <if test="distributeLevelCount != null">
+                distributeLevelCount=#{distributeLevelCount},
+            </if>
+            <if test="useLevelDi != '' and useLevelDi != null">
+                useLevelDi=#{useLevelDi},
+            </if>
+            <if test="useLevelUnit != '' and useLevelUnit != null">
+                useLevelUnit=#{useLevelUnit},
+            </if>
+            <if test="useLeverCount != null">
+                useLeverCount=#{useLeverCount},
+            </if>
+
         </trim>
         WHERE id = #{id}
     </update>