Merge remote-tracking branch 'origin/master'

service-manager/src/main/java/com/winsun/controller/hhrUserController.java

@@ -70,10 +70,11 @@ public class hhrUserController extends BaseController {
         Wrapper<Order> wrapper = new EntityWrapper();
         wrapper.in("hehuoren_id", userList);
         if (StringUtils.isNotBlank(customer)) {
-            wrapper.addFilter("(contact_number LIKE '%" + customer + "%' OR customer_name LIKE '%+" + customer + "+%')");
+            wrapper.addFilter("(contact_number LIKE '%" + customer + "%' OR customer_name LIKE '%" + customer + "%')");
         }
         wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus);
         wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
+        wrapper.orderBy("create_time",false);
 
         List<Order> orderList = orderMapper.selectPage(page, wrapper);
         page.setRecords(orderList);