You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

wangsr 4ea06e3a12 Merge branch 'wangsr' into dep ... # Conflicts: # Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/InitAction.cs		1 year ago
..
AddWaterLogEntity.cs	change - 维护DB91 90 1 手动控制添加冷热水交替检测	1 year ago
InitAction.cs	Merge branch 'wangsr' into dep	1 year ago
ManualControlAction.cs	Merge branch 'wangsr' into dep	1 year ago
ManualControlSettingEntity.cs	change - 配置存到数据库 前端页面报警数据位置纠正	1 year ago
ManualLogEntity.cs	change - 更改日志记录方式 重构手动控制日志记录	1 year ago
Setting.Designer.cs	add - 手动控制添加保存功能	1 year ago
Setting.settings	add - 手动控制添加保存功能	1 year ago