Merge branch 'feature-dingwf-0715' into develop

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

@@ -27,7 +27,7 @@ public class MapLayerCustomizeEntity {
     private String layerDescribe;
     private String layerDescribe;
 
 
     @Column(name = "disabled", nullable = false)
     @Column(name = "disabled", nullable = false)
-    private boolean disabled;
+    private Boolean disabled;
 
 
     @Column(name = "memo", nullable = false, length = 100)
     @Column(name = "memo", nullable = false, length = 100)
     private String memo;
     private String memo;