# Conflicts:
#	src/main/java/com/zjty/inspect/entity/DevelopLanguageSystem.java

Merge branches 'lj-project' and 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project