Merge remote-tracking branch 'origin/master'

mybusiness/src/main/resources/templates/system/interfaceinfo/add.html

@@ -27,7 +27,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">共享方式：</label>
                 <div class="col-sm-8">
-                    <select name="shareType" disabled class="form-control m-b" th:with="type=${@dict.getType('share_type')}">
+                    <select name="shareType" class="form-control m-b" th:with="type=${@dict.getType('share_type')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>

mybusiness/src/main/resources/templates/system/interfaceinfo/edit.html

@@ -28,7 +28,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">共享方式：</label>
                 <div class="col-sm-8">
-                    <select name="shareType" disabled class="form-control m-b" th:with="type=${@dict.getType('share_type')}">
+                    <select name="shareType" class="form-control m-b" th:with="type=${@dict.getType('share_type')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{shareType}"></option>
                     </select>
                 </div>

mybusiness/src/main/resources/templates/visualization/edition2/index2.html

@@ -200,7 +200,7 @@
 		</div>
 		
 		<!-- 弹框 开始-->
-		<!-- <iframe id="tk_iframe" th:src="@{tk_iframe.html"></iframe> -->
+		 <iframe id="tk_iframe" th:src="@{/visualization/edition2/tk_iframe.html}"></iframe>
 		<!-- 弹框 结束-->
 		<script>
 			//宇宙特效