Merge branch 'master' of http://git.zthymaoyi.com/ccj/muban

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/shop/impl/ShopOrderServiceImpl.java

@@ -161,7 +161,7 @@ public class ShopOrderServiceImpl implements IShopOrderService {
             wrapper.like("dang_order_status", dangOrderStatus);
         }
         wrapper.eq("delete_flag", 0);
-        wrapper.orderBy("gmt_update",false);
+        wrapper.orderBy("created_time",false);
         List<ShopOrder> list = shopOrderMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
         for (ShopOrder shopOrder: list
              ) {