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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html

@@ -200,7 +200,7 @@
 <script th:src="@{/js/jquery.tmpl.js}"></script>
 <th:block th:include="include :: bootstrap-fileinput-js" />
 <script type="text/javascript">
-    var platformUrl = [[${platformUrl}]];
+    var platformUrl = `[[${platformUrl}]]`
     var prefix = ctx + "sweet/sweetIntegralActivity";
     let showIndex = null;
     // 初始化数据, 可以由后台传过来