Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

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

@@ -51,7 +51,8 @@
               shiro:hasPermission="exam:product:remove">
                <i class="fa fa-remove"></i> [[#{basis.del}]]
            </a>
            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="exam:product:export">
            <a style="background-color: #a87242;border-color: #a87242;color: #FFFFFF"
                class="btn" onclick="$.table.exportExcel()" shiro:hasPermission="exam:product:export">
                <i class="fa fa-download"></i> [[#{basis.export}]]
            </a>
        </div>