bea1a8c5 by renchao@pashanhoo.com

1

1 parent 6f671c24
...@@ -462,10 +462,6 @@ ...@@ -462,10 +462,6 @@
462 ], 462 ],
463 isShow: false, 463 isShow: false,
464 disabled: true, 464 disabled: true,
465 <<<<<<< HEAD
466 czrOptions: [],
467 =======
468 >>>>>>> dev
469 ssQlxxList: [], 465 ssQlxxList: [],
470 ruleForm: {}, 466 ruleForm: {},
471 ableOperation: false, 467 ableOperation: false,
......