ERP_override.git

			@@ -198,7 +198,6 @@
			and o.delivery_address REGEXP #{order.deliveryAddress}
			</if>
			order by o.id desc
			limit #{offset},#{pageSize}
			</select>

			<update id="reviewOrderById">
			@@ -220,7 +219,7 @@
			</update>

			<update id="updateMoney">
			update `order` set money = #{order.money} where order_id = #{order.orderId}
			update `order` set money = #{order.money},calculate_type = #{order.calculateType} where order_id = #{order.orderId}
			</update>

			<update id="cancelOrder">