Merge branch 'feature/商业伙伴.代理店优化' into develop

src/main/webapp/modules/layout/server_layout_save.lsc

@@ -229,6 +229,9 @@
                             while (e && e.getCause && e.getCause()) e = e.getCause();
                             var error_code = e.getErrorCode();
                             if (error_code == 1) {
+                            if(base_table.toUpperCase()=='HLS_LEASE_ITEM'){
+                            raise_app_error('机种代码和型号不能重复！');
+                            }else
                                 raise_app_error('HLS_TABLE_UNIQUE.' + base_table.toUpperCase());
                             }
                             if (parent_error_code) {