Merge remote-tracking branch 'origin/康年堂' into 康年堂

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -1202,7 +1202,7 @@ public interface FsStoreOrderScrmMapper
             "<trim prefix=\"SET\" suffixOverrides=\",\">\n" +
             "            <if test=\"storeId != null\">store_id = #{storeId},</if>\n" +
             "            <if test=\"userId != null and userId != ''\">user_id = #{userId},</if>\n" +
-            "            <if test=\"userName != null and userName != ''\">user_name = #{userName},</if>\n" +
+            "            <if test=\"realName != null and realName != ''\">real_name = #{realName},</if>\n" +
             "            <if test=\"userPhone != null and userPhone != ''\">user_phone = #{userPhone},</if>\n" +
             "            <if test=\"userAddress != null and userAddress != ''\">user_address = #{userAddress},</if>\n" +
             "            <if test=\"cartId != null and cartId != ''\">cart_id = #{cartId},</if>\n" +
@@ -1225,6 +1225,7 @@ public interface FsStoreOrderScrmMapper
             "            <if test=\"deliveryCode != null\">delivery_code = #{deliveryCode},</if>\n" +
             "            <if test=\"deliveryName != null\">delivery_name = #{deliveryName},</if>\n" +
             "            <if test=\"deliverySn != null\">delivery_sn = #{deliverySn},</if>\n" +
+            "            <if test=\"deliveryId != null\">delivery_id = #{deliveryId},</if>\n" +
             "            <if test=\"remark != null\">remark = #{remark},</if>\n" +
             "            <if test=\"isDel != null\">is_del = #{isDel},</if>\n" +
             "            <if test=\"costPrice != null\">cost_price = #{costPrice},</if>\n" +