Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-11-27 fbf6a877aae46e19a8d3c0058cefa3f81c72715f

 kidgrow-commons/kidgrow-redis-spring-boot-starter/src/main/java/com/kidgrow/redis/util/RedisConstant.java

@@ -10,4 +10,6 @@
    String USER_ORGANIZATION="USER_ORGANIZATION";

    String ORGANIZATION="ORGANIZATION";

    String EQUIPMENT_DOCKING_TIME="EquipmentDockingTime";
}