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

无关风月

5 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-management/src/main/webapp/static/modular/system/coursePackage/TCoupon.js

@@ -328,7 +328,7 @@
    if (!window.parent.document.getElementById("cityCode")== null){
        cityCode = window.parent.document.getElementById("cityCode").value;
    }
    table.queryParams = {'cityCode': cityCode,
    table.queryParams = {'cityCode': window.parent.document.getElementById("cityCode").value,
        'storeId': window.parent.document.getElementById("storeId").value}
    table.height=600
    TCoupon.table = table.init();