diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906141150__L_ALTER_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906141150__L_ALTER_MENU.sql deleted file mode 100644 index 9bbb5f9eb..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201906141150__L_ALTER_MENU.sql +++ /dev/null @@ -1,4 +0,0 @@ -update mall_permission set name = '多经点位租金合同' where name ='多经点位租赁合同'; -INSERT INTO `mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) -VALUES - (305, '多经点位租赁合同', 3, 'Y', NULL, 1, NULL, NULL, 'pointLeaselist', 'icon-wuyehetong', 0, 305); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906151116__L_ALTER_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906151116__L_ALTER_MENU.sql new file mode 100644 index 000000000..25e22262f --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906151116__L_ALTER_MENU.sql @@ -0,0 +1,9 @@ +update mall_permission set name = '商铺租金合同' where name ='商铺租赁合同'; +INSERT INTO `mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES + (305, '商铺租赁合同', 3, 'Y', NULL, 1, NULL, NULL, 'rentLeaselist', 'icon-wuyehetong', 0, 305); + +update mall_permission set name = '多经点位租金合同' where name ='多经点位租赁合同'; +INSERT INTO `mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES + (306, '多经点位租赁合同', 3, 'Y', NULL, 1, NULL, NULL, 'pointLeaselist', 'icon-wuyehetong', 0, 306); \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 8d6b915b7..a1820b953 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -937,7 +937,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } public static void main(String[] args) { - System.out.println(3&1100); + List l = new ArrayList(); + l.add(1) ; } }