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

cash-service/market-service/src/main/resources/mapper/MkProductSmartSuggestMapper.xml

@@ -9,11 +9,10 @@
         WHERE shop_id = #{shopId}
           AND is_del = 0
           AND status = 1
-          AND NOW() BETWEEN valid_start_time AND valid_end_time
           AND (use_time_type = 'all' OR
                (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time))
           AND FIND_IN_SET(#{week}, use_days) > 0
-        ORDER BY sort,
+        ORDER BY id,
                  update_time DESC,
                  create_time DESC
     </select>