Merge branch 'dev-1.1.4' into 'dev-1.1.4'

特殊标志维护优化

See merge request lihong/thmz_system!68

src/main/resources/static/js/yf/yf_special_mark.js

@@ -185,7 +185,7 @@ function loadBatch(chargeCode) {
 function initBatch() {
     $.jgrid.gridUnload("tb_table_batch");
     $("#tb_table_batch").jqGrid({
-        datatype: 'json',
+        datatype: 'local',
         mtype: 'get',
         url: '/thmz/getYpZdYpbh',
         loadBeforeSend: function (jqXHR) {