Merge branch 'develop_dl_0410' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_0410

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/BasicEntity.java

@@ -37,7 +37,7 @@ public class BasicEntity implements Serializable{
 
 	@Id
     @GeneratedValue(generator = "myIdGeneratorConfig",
-            strategy = GenerationType.SEQUENCE)
+            strategy = GenerationType.AUTO)
     @GenericGenerator(
             name = "myIdGeneratorConfig",
             strategy = "com.yeejoin.amos.patrol.core.common.request.MyIdGeneratorConfig")

amos-boot-system-patrol/src/main/resources/application.properties

@@ -67,4 +67,9 @@ equipment.hierarchy=1,2,4,6
 
 management.security.enabled=true
 spring.security.user.name=admin
-spring.security.user.password=a1234560
+spring.security.user.password=a1234560
\ No newline at end of file
+
+#雪花算法参数  终端ID
+generator.worker_id=1
+#雪花算法参数  数据中心id
+generator.datacenter_id=1
\ No newline at end of file