| 
							
							
								 aixianling | a5dbdbe778 | Merge branch 'dev' into vite # Conflicts:
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/components/Add.vue
#	project/dv/apps/AppGridDV.vue
#	vue.config.js | 2022-08-23 11:14:38 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 7500bf286e | BUG 30889 | 2022-08-17 14:48:56 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 0e250bbaba | BUG 30886 | 2022-08-17 11:38:23 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | b0bd16a53b | BUG 30873 | 2022-08-17 08:43:47 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 82063280f7 | 监测对象增加导出名单 | 2022-08-15 13:52:34 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 3329cd4bf1 | 去除formatContent | 2022-07-27 10:24:38 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | bd410a9559 | 修复接口调用 | 2022-07-18 14:46:00 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 0e96395d98 | fpPrtpStatus | 2022-07-07 10:11:01 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 5c7e2e4098 | 30530 | 2022-07-07 09:27:48 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | da8e8f0d65 | Merge branch 'dev' into vite # Conflicts:
#	examples/main.js
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/List.vue
#	packages/bigscreen/designer/components/SourceData.vue
#	packages/bigscreen/designer/components/form/DataConfig.vue
#	packages/bigscreen/designer/config.js
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	packages/conv/creditScore/scoreManage/scoreChange.vue
#	packages/index.js
#	project/dv/apps/AppGridDV.vue
#	project/dvui/components/AiMonitor/dhVideo.vue
#	project/dvui/components/AiSwiper.vue
#	project/dvui/layout/AiDvBackground.vue
#	project/dvui/layout/AiDvSummary/AiDvSummary.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
#	project/dvui/package.json
#	public/index.html
#	vue.config.js | 2022-07-07 09:01:40 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 92f8fd0af8 | bug | 2022-07-06 18:25:49 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 62752263c0 | 30499 | 2022-07-06 10:20:07 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 2f5aba907e | 工作考核 | 2022-07-05 17:05:45 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 86b1349a46 | bug | 2022-07-05 10:58:43 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | d046ca1dd6 | 监测对象 | 2022-07-04 14:24:27 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | e02aad528e | 30487 | 2022-07-04 14:21:57 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 0d5a9fed10 | 30486 | 2022-07-04 14:13:55 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 315d852eaf | BUG 30381 | 2022-06-28 15:03:50 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 90ab2dec01 | 秀山需求变更 | 2022-06-23 15:58:25 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 1a3827e541 | 样式整合 | 2022-06-23 14:28:48 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | cc283155a1 | BUG 30299 | 2022-06-23 14:00:34 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | b66d14f53e | 迁移位置 | 2022-06-20 10:24:39 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 1b07cef1d5 | bug | 2022-06-13 18:22:04 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | f74ca9402a | 户类型 | 2022-06-13 16:07:42 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 08f8739a80 | 防返贫 | 2022-06-13 16:03:08 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 8fe7970b81 | 30156 | 2022-06-13 09:40:10 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 0736ea98d0 | 30151 | 2022-06-13 09:09:45 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 81a61c4ec4 | 防返贫 | 2022-06-11 15:45:50 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | c5d3b941dc | 防返贫 | 2022-06-11 15:08:40 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | b2600d0de5 | BUG 29336 | 2022-06-08 19:23:25 +08:00 |  | 
			
				
					| 
							
							
								 liuye | a4ac8060ba | 29753 | 2022-05-23 11:40:27 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 5916681635 | BUG 29716 | 2022-05-20 17:10:30 +08:00 |  | 
			
				
					| 
							
							
								 liuye | 2a416e8177 | 29743 | 2022-05-20 15:33:27 +08:00 |  | 
			
				
					| 
							
							
								 liuye | b0457b8161 | 帮扶申报 | 2022-05-20 13:55:42 +08:00 |  | 
			
				
					| 
							
							
								 liuye | 16aaa2e95a | 29709 | 2022-05-20 11:59:04 +08:00 |  | 
			
				
					| 
							
							
								 liuye | be0c55de75 | 帮扶申报 | 2022-05-20 11:53:51 +08:00 |  | 
			
				
					| 
							
							
								 liuye | 63286e3f48 | 帮扶申报 | 2022-05-19 15:33:51 +08:00 |  | 
			
				
					| 
							
							
								 liuye | 4e36387bb2 | 帮扶申报 | 2022-05-19 11:43:39 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 5d4a8af8d7 | 28735  28741 | 2022-05-11 09:33:32 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | e91d1f73dc | Merge branch 'dev' into vite # Conflicts:
#	examples/App.vue
#	examples/router/autoRoutes.js
#	examples/utils/index.js
#	package.json
#	packages/wechat/AppProjectActivities/components/Event.vue
#	project/dv/apps/AppHomesteadDV.vue
#	vue.config.js | 2022-05-10 20:06:15 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 036ee91533 | 目录代码整合 | 2022-05-10 20:02:37 +08:00 |  |