Merge remote-tracking branch 'origin/master'

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/OrgController.java

@@ -620,7 +620,7 @@ public class OrgController extends ControllerSupport {
 		validateRootOrgIsolation(orgEntity.getRootId());
 
 		String key = "propertyGroup." + propertyGroupId;
-		String redisKey = "PROPERTIES_BY_GROUP:" + key;
+		String redisKey = "PROPERTIES_BY_GROUP:" + orgId + ":" + key;
 		@SuppressWarnings("unchecked")
 		Map<String, String> properties = redisClient.get(redisKey, Map.class);
 		if (null != properties) {