Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -145,7 +145,7 @@
			bId,t.machine_name,t.machine_name machineName,t.machine_type_cd,t.machine_type_cd
			machineTypeCd,t.machine_ip,t.machine_ip machineIp,td.name machineTypeCdName,
			t.state,c.location_id locationTypeCd, c.location_name locationTypeName, t.location_obj_id locationObjId,
			t.location_type_cd,t.location_obj_id,t.heartbeat_time,t.heartbeat_time heartbeatTime
			t.location_type_cd,t.location_obj_id,t.heartbeat_time,t.heartbeat_time heartbeatTime,
			td1.name stateName,t.create_time createTime,t.direction,td3.name directionName
			from machine t
			left join t_dict td on t.machine_type_cd=td.status_cd and td.table_name='machine' and td.table_columns='machine_type_cd'
			@@ -254,7 +254,7 @@
			<if test="direction !=null and direction != ''">
			, t.direction = #{direction}
			</if>
			<if test="heartbeatTime !=null and heartbeatTime != ''">
			<if test="heartbeatTime !=null ">
			, t.heartbeat_time = #{heartbeatTime}
			</if>
			where 1=1