Merge branch 'api' into order_reform

Helius

2021-01-09 02651c072281f68c4119116ad36c5bb06ec8c637

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml

@@ -466,6 +466,7 @@
      <result property="vipName" column="vipName" />
      <result property="timeLength" column="timeLength" />
      <result property="status" column="status" />
      <result property="createStaffId" column="createStaffId" />
      <collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
         <result property="projName" column="projName" />
         <result property="beautyName" column="beautyName" />
@@ -481,6 +482,7 @@
         a.YY_TIME time,
         a.TOTAL_TIME timeLength,
         a.state status,
         a.create_staff_id createStaffId,
         d.BED_NAME bed,
         e.VIP_NAME vipName,
         b.staff_id staffId,