Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

81041

2019-01-02 f355ecbb80aac6b4c2f0ef668061c1ac3917fd9a

Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java

@@ -77,7 +77,7 @@
             {"taskchange_query_permit","37"},    //作业变更查询

             

             {"batt_test_op_permit","58"},    //电池放电测试

             {"batt_test_op_permit","81"},    //批量电池放电测试

             {"batt_discharge_model_permit","81"},    //批量电池放电测试

             

             //超级管理员界面

             {"batt_discharge_model_permit","59"},    //设备充放电模块参数