platform / platform-cms · Commits

…to dev_grass_20190108

# Conflicts:
#	operations/src/main/java/com/yohobuy/platform/operations/restapi/ActivtyTemplatedController.java
#	operations/src/main/java/com/yohobuy/platform/operations/service/impl/ActivtyTemplatedLogService.java
#	operations/src/main/java/com/yohobuy/platform/operations/service/impl/ActivtyTemplatedService.java

# Conflicts:
#	cms/src/main/java/com/yohobuy/platform/cms/service/impl/ClientConfigServiceImpl.java

…to dev-csm-split-1126

…to dev-csm-split-1126