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

yj

2020-03-13 1da0cccd804b441ac94a35f28a2ed23a6a7062cc

 fanli/src/main/java/com/yeshi/fanli/mapping/pdd/PDDOrderMapper.xml

@@ -234,6 +234,14 @@
      WHERE FROM_UNIXTIME(po_order_create_time,'%Y-%m-%d') = #{preDay}

   </select>



   <select id="countOrderNumber" resultMap="ChartMap">

      SELECT IFNULL(COUNT(`po_id`),0) AS showValue,

      <include refid="Column_DateType" />

      FROM `yeshi_ec_pdd_order` t WHERE po_order_create_time IS NOT NULL

      <include refid="Count_Select_DateType" />

      <include refid="Count_Group_DateType" />

      ORDER BY po_order_create_time

   </select>





   <select id="listByStatus" resultMap="BaseResultMap">