Merge remote-tracking branch 'origin/master'

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

@@ -1069,7 +1069,7 @@ public interface FsStoreOrderScrmMapper
      * @param ids 订单id
      * **/
     List<FsStoreOrderScrm> selectStoreOrderScrmInId(@Param("ids") Long[] ids);
-    void batchUpdateInOrderCode(@Param("dtoList") List<FsOrderDeliveryNoteDTO> dtoList);
+    void batchUpdateInOrderCode(@Param("list") List<FsOrderDeliveryNoteDTO> dtoList);
 
     @Select({"<script> " +
             "select so.*,st.store_name,us.nick_name,us.phone,d.doctor_name,p.patient_name,p.prescribe_code,c.company_name,cu.nick_name company_user_name,cts.name as schedule_name,po.product_cost_price total_cost_money,po.inquiry_cost_price inquiry_money,po.total_cost_price,po.cost_discount_money inquiryDiscountMoney, total_money,p.diagnose " +