liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b1d3e3567
							
						
					 | 
					
						
						
							
							fix(merge): rebuild & merge
						
						
						
						
						
						
						
						rebuild & merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-19 14:58:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec18910e26
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-19 14:57:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b0a17518d
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-19 14:56:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b5e0f1cfd
							
						
					 | 
					
						
						
							
							首页去掉控制器
						
						
						
						
						
						
					 | 
					
						2023-10-19 14:22:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							e05b222326
							
						
					 | 
					
						
						
							
							修改参数
						
						
						
						
						
						
					 | 
					
						2023-10-19 11:32:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed99e20791
							
						
					 | 
					
						
						
							
							更新折线图和新增温室设备页
						
						
						
						
						
						
					 | 
					
						2023-10-19 11:10:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e27ba27a8
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-14 14:34:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f85c4505c
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-14 14:27:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							41f2f89daf
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-14 14:26:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							905880c498
							
						
					 | 
					
						
						
							
							fix(ignore): add igonre
						
						
						
						
						
						
						
						add igonre
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-14 14:25:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							51d7facc9b
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-14 14:24:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd84eb5608
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-14 13:48:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0dbd6d2f2
							
						
					 | 
					
						
						
							
							取消1|2分钟刷新加载效果
						
						
						
						
						
						
					 | 
					
						2023-10-14 11:16:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							16976e3bec
							
						
					 | 
					
						
						
							
							fix(rebuid): rebuild
						
						
						
						
						
						
						
						rebuild
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-14 09:00:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							2fe5b28568
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-14 09:00:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a491ca518
							
						
					 | 
					
						
						
							
							隐藏5s刷新显示效果
						
						
						
						
						
						
					 | 
					
						2023-10-14 08:40:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e9529b41c
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 17:29:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							d95c3d7bd3
							
						
					 | 
					
						
						
							
							fix(fix): fix bugs
						
						
						
						
						
						
						
						fix bugs
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 17:26:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							3523380010
							
						
					 | 
					
						
						
							
							优化折线图
						
						
						
						
						
						
					 | 
					
						2023-10-13 17:07:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							2830005fe8
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 15:11:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9cf118f2d
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 15:01:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4cc5a025e
							
						
					 | 
					
						
						
							
							分享/朋友圈/折线图单位
						
						
						
						
						
						
					 | 
					
						2023-10-13 14:58:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							1811c2ccca
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 10:25:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							5206478e4a
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 10:22:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							601bf1c748
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 10:17:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							987fda70f3
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 10:17:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cf750214d
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 10:15:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							aef995f446
							
						
					 | 
					
						
						
							
							自动升级版本
						
						
						
						
						
						
					 | 
					
						2023-10-13 10:06:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a70932008
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-13 09:48:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c79ac9161
							
						
					 | 
					
						
						
							
							折线图修改
						
						
						
						
						
						
					 | 
					
						2023-10-13 08:55:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a9a2a10f2
							
						
					 | 
					
						
						
							
							新增updatatime,离线-状态隐藏和修改72参数
						
						
						
						
						
						
					 | 
					
						2023-10-12 17:15:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e2f0850af
							
						
					 | 
					
						
						
							
							fix(build): rebuild gen file
						
						
						
						
						
						
						
						rebuild gen file
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-12 14:31:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							3224184649
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-12 14:27:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							c36307ecd8
							
						
					 | 
					
						
						
							
							新增5s刷新和取消无用模块
						
						
						
						
						
						
					 | 
					
						2023-10-09 18:07:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							09572f1b8a
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-08 19:10:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							157caafa10
							
						
					 | 
					
						
						
							
							fix(build): build
						
						
						
						
						
						
						
						build
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-08 19:09:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							3bbef18a2e
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-08 19:07:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							424faa855f
							
						
					 | 
					
						
						
							
							修改等号bug
						
						
						
						
						
						
					 | 
					
						2023-10-08 18:28:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffeb1a50d6
							
						
					 | 
					
						
						
							
							state接口
						
						
						
						
						
						
					 | 
					
						2023-10-08 17:12:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d0b9210e8
							
						
					 | 
					
						
						
							
							小程序跳转PC
						
						
						
						
						
						
					 | 
					
						2023-10-08 15:37:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc701a4366
							
						
					 | 
					
						
						
							
							fix(build): build latest data
						
						
						
						
						
						
						
						build latest data
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-08 11:39:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7cbc4d1ff
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-08 11:37:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							92175700a3
							
						
					 | 
					
						
						
							
							fix(builder): latest builder
						
						
						
						
						
						
						
						latest builder
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-07 22:31:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							d90f15a70f
							
						
					 | 
					
						
						
							
							fix(merge): merge
						
						
						
						
						
						
						
						merge
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-07 22:29:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liubaixun
							
						 
					 | 
					
						
						
						
						
							
						
						
							5784295618
							
						
					 | 
					
						
						
							
							fix(dist): build latest code
						
						
						
						
						
						
						
						build latest code
Signed-off-by: liubaixun <liubaixun@yinxiang.com> 
						
						
					 | 
					
						2023-10-07 21:36:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							97ab8e6518
							
						
					 | 
					
						
						
							
							取消3秒刷新
						
						
						
						
						
						
					 | 
					
						2023-10-07 18:36:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							58160ca38a
							
						
					 | 
					
						
						
							
							解决管道压力单位问题
						
						
						
						
						
						
					 | 
					
						2023-10-07 17:16:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							03e52f9e35
							
						
					 | 
					
						
						
							
							解决一直加载问题
						
						
						
						
						
						
					 | 
					
						2023-10-07 16:53:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							aaa4a9afda
							
						
					 | 
					
						
						
							
							环境数据三刷
						
						
						
						
						
						
					 | 
					
						2023-10-07 14:44:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pangdundun
							
						 
					 | 
					
						
						
						
						
							
						
						
							776306f95a
							
						
					 | 
					
						
						
							
							用户名和密码缓存
						
						
						
						
						
						
					 | 
					
						2023-10-07 11:51:58 +08:00 | 
					
					
						
						
							
							
							
						
					 |