Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

昨天 ecd5b6b51b7ddc4efe63c49c3c68adb276a2a2cb

 rsf-server/src/main/resources/mapper/manager/AsnOrderMapper.xml

@@ -29,7 +29,7 @@
                    `day_time` BETWEEN ( CURDATE() - INTERVAL 1 MONTH )
                        AND CURDATE()
                GROUP BY
                    `day_time`, task_type
                    `day_time`, task_type,id
            ) t
        ${ew.customSqlSegment}
    </select>