Merge branch 'dev_layer0731' into 'develop'

修改数据库表结构

See merge request !305

project-order/src/main/java/com/dituhui/pea/order/entity/MapLayerCustomizeEntity.java

@@ -26,8 +26,8 @@ public class MapLayerCustomizeEntity {
     @Column(name = "layer_describe", nullable = false, length = 200)
     private String layerDescribe;
 
-    @Column(name = "disabled", nullable = false)
-    private Boolean disabled;
+    @Column(name = "status", nullable = false)
+    private int status;
 
     @Column(name = "memo", nullable = false, length = 100)
     private String memo;

project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java

@@ -234,7 +234,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		}
 
 		LambdaQueryWrapper<MapLayerCustomize> lqwLayer = new LambdaQueryWrapper<>();
-		lqwLayer.eq(MapLayerCustomize::getDisabled, 1);
+		lqwLayer.eq(MapLayerCustomize::getStatus, 1);
 		lqwLayer.in(MapLayerCustomize::getBranchId, new ArrayList<>(branchIds));
 		List<MapLayerCustomize> layerCustomizes = mapLayerCustomizeMPDao.selectList(lqwLayer);
 		for(MapLayerCustomize r: layerCustomizes) {