Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

 zq-erp/src/main/resources/templates/views/admin/sys/admin-form.html

@@ -234,7 +234,7 @@
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script  th:inline="javascript">
   
   var invokeUrl=basePath +"/admin/addAdmin";
   var invokeUrl=basePath +"/admin/addShopAdmin";
   /*<![CDATA[*/
   var obj=/*[[${obj}]]*/
   /*]]>*/