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

src/main/resources/mapper/SubmitMapper.xml

@@ -478,7 +478,10 @@
             shopProductAmount = #{shopProductAmount},
         </if>
         <if test="shopTaxFee != null">
-            shopTaxFee = #{shopTaxFee}
+            shopTaxFee = #{shopTaxFee},
+        </if>
+        <if test="shouldPayShopAmount != null">
+            shouldPayShopAmount = #{shouldPayShopAmount}
         </if>
         where shopOrderId = #{shopOrderId}
     </update>