周伟鹏 / cnlive_shenhe · Commits

# Conflicts:
#	src/main/resources/application.properties

# Conflicts:
#	src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java

# Conflicts:
#	src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java

# Conflicts:
#	src/main/java/com/cnlive/shenhe/api/YiDunControllerApi.java
#	src/main/java/com/cnlive/shenhe/entity/ShyYidun.java
#	src/main/java/com/cnlive/shenhe/job/VideosJob.java
#	src/main/java/com/cnlive/shenhe/mapper/ShyYidunMapper.java
#	src/main/java/com/cnlive/shenhe/serviceImpl/YiDunServiceImpl.java

# Conflicts:
#	src/main/java/com/cnlive/shenhe/job/ContentJob.java
#	src/main/java/com/cnlive/shenhe/job/YiDunUrlResultJob.java
#	src/main/java/com/cnlive/shenhe/utils/YiDunAntiFraudUtil.java