Merge branch 'hotfix' into develop

src/main/resources/templates/partner_apply_info.html

@@ -14,7 +14,7 @@
     <script type="text/javascript" src="/static/lib/jweixin/jweixin-1.0.0.js"></script>
     <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
     <script type="text/javascript" src="/static/lib/decimal/decimal.min.js"></script>
-    <script type="text/javascript">
+    <script type="text/javascript" data-th-inline="javascript">
         $(document).ready(function () {
             $('#orgSelect').change(function () {
                 var orgId = $(this).val();
@@ -47,11 +47,12 @@
                 obj.apply_approve_result = 1;
                 obj.bd_name = $('#bdSelect option:selected').html();
                 var org_id = $('#orgSelect').val();
+                var client_apply_id = /*[[${applyClient['client_apply_id']}]]*/0;
                 if (!obj.bd_id || !obj.bd_name) {
                     return;
                 }
                 $.ajax({
-                           url: '/partners/application/' + '${applyClient.client_apply_id}',
+                           url: '/partners/application/' + client_apply_id,
                            method: 'PUT',
                            data: JSON.stringify(obj),
                            contentType: 'application/json',
@@ -63,9 +64,10 @@
             });
             $('#refusePartner').click(function () {
                 var obj = {};
+                var client_apply_id = /*[[${applyClient['client_apply_id']}]]*/0;
                 obj.apply_approve_result = 3;
                 $.ajax({
-                           url: '/partners/application/' + '${applyClient.client_apply_id}',
+                           url: '/partners/application/' + client_apply_id,
                            method: 'PUT',
                            data: JSON.stringify(obj),
                            contentType: 'application/json',