Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-03-15 789c5301ba9c69f779cb0b29f22857299760a960

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml

@@ -55,10 +55,12 @@
      where
         a.sales_user_id=#{record.userId}
         and   a.revenue_type=#{record.revenueType}
      <if test="orderStatus!=null" >
      <if test="record.orderStatus!=null" >
         and a.order_status=#{record.orderStatus}
      </if>
      order by #{record.sort} #{record.order}
      <if test="record.sort!=null and record.order!=null" >
      order by ${record.sort} ${record.order}
      </if>

   </select>