~zhoushihao/YiWuProject.git

			@@ -3,7 +3,7 @@

			spring:
			profiles:
			active: cz
			active: yw
			application:
			name: cacheGlass
			liquibase:
			@@ -28,23 +28,23 @@
			secondLength: 2500
			min:
			one: #第一条磨边线的最小尺寸信息
			firstLength: 500
			secondLength: 400
			firstLength: 460
			secondLength: 390
			two: #第二条磨边线的最小尺寸信息
			firstLength: 400
			secondLength: 400
			glassGap: 300
			cellLength: 2700
			firstLength: 390
			secondLength: 390
			glassGap: 2500
			cellLength: 2500
			sequence:
			order: false
			kangaroohy:
			milo:
			enabled: false
			enabled: true
			primary: default
			config:
			default:
			endpoint: opc.tcp://192.168.10.241:49320
			endpoint: opc.tcp://192.168.2.100:49320
			security-policy: basic256sha256
			username: liu
			username: admin
			password: 1qaz2wsx3edc4rfv