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

6a35bb92 · 胡佳晨 · 11572602 · 508070b3 · 6a35bb92
Commit 6a35bb92 authored Nov 11, 2021 by 胡佳晨
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

coupon1.html ...esources/templates/zhengzai/candy/coupon/mgt/coupon1.html +2 -2

No files found.
--- a/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon1.html
+++ b/liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon1.html
@@ -65,8 +65,8 @@
                removeUrl: prefix + "/cancel/{id}",
                // updateUrl: prefix + "/edit/{id}",
                // exportUrl: prefix + "/export",
-                // sortName: "createdAt",
-                // sortOrder: "desc",
+                sortName: "createdAt",
+                sortOrder: "desc",
                modalName: "代金券",
                columns: [
                    {