Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/resources/templates/exam/template/template.html

@@ -54,7 +54,10 @@
                <a style="background-color: #a87242;border-color: #a87242;color: #FFFFFF"
                   class="btn" onclick="$.table.exportExcel()" shiro:hasPermission="exam:template:export">
                    <i class="fa fa-download"></i> [[#{dict.ic22}]]
                 </a>
                </a>
                <a class="btn btn-danger+" onclick="emailEdit()" shiro:hasPermission="exam:email:edit">
                    <i class="fa fa-edit"></i> [[#{dict.ic175}]]
                </a>
            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table" data-mobile-responsive="true"></table>
@@ -129,6 +132,11 @@
            };
            $.table.init(options);
        });

        function emailEdit() {
            var url = prefix + '/emailEdit';
            $.modal.open([[#{dict.ic175}]], url);
        }
    </script>
</body>
</html>