zxc
							
						 | 
						
							
							
							
								
							
								1061683468
								
							
								
							
						 | 
						
							
							
								
								已转项目添加 issueTitle
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								30f87ce08c
								
							
								
							
						 | 
						
							
							
								
								议题总数修改,议题审核被拒绝修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4921fda5bc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								857cb7137f
								
							
								
							
						 | 
						
							
							
								
								议题总数修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								918162bafd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oss_private' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b779d862b7
								
							
								
							
						 | 
						
							
							
								
								修改:修改错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								41a98879a4
								
							
								
							
						 | 
						
							
							
								
								修改:补充
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								617f742239
								
							
								
							
						 | 
						
							
							
								
								审核ID添加
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								e32d873ef2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oss_private' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b9057df5c7
								
							
								
							
						 | 
						
							
							
								
								修改:在前端无法做oss私有链接适配的情况下,暂且使用/internal目录来区分私有文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d563968737
								
							
								
							
						 | 
						
							
							
								
								修改:使用阿里云私有bucket存储项目附件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								2aca0a1c3c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_oss_private' into dev_project_branch
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-gateway/pom.xml
#	epmet-gateway/src/main/resources/bootstrap.yml
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java
#	epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/service/impl/ScanServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5cf29ece5d
								
							
								
							
						 | 
						
							
							
								
								新增阿里云oss 的私有和公有bucket访问相关代码
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								950b379910
								
							
								
							
						 | 
						
							
							
								
								议题详情去掉权限、居民热议列表添加排序字段
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								79f246b034
								
							
								
							
						 | 
						
							
							
								
								重要消息通知机器人更好地址
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b1eb4d07c0
								
							
								
							
						 | 
						
							
							
								
								日志打印
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								71128aeca8
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								142c741131
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								6e50cfdf21
								
							
								
							
						 | 
						
							
							
								
								增加helper-video帮助视频
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								da628cb92b
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7b382dd4af
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								7f50e2cdfa
								
							
								
							
						 | 
						
							
							
								
								修改url单词错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								901e62278a
								
							
								
							
						 | 
						
							
							
								
								版本升级
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								fb1ce0df25
								
							
								
							
						 | 
						
							
							
								
								gateway-增加epmet-openapi-adv服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								b0990d0ea8
								
							
								
							
						 | 
						
							
							
								
								版本升级+配置问题修复
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								d9762d1641
								
							
								
							
						 | 
						
							
							
								
								版本修改
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								754eaec170
								
							
								
							
						 | 
						
							
							
								
								调整adv服务的模块包含关系
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								5ada2fe3c0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								244da82c19
								
							
								
							
						 | 
						
							
							
								
								新增adv广告服务
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								157b4a9f59
								
							
								
							
						 | 
						
							
							
								
								议题已关闭列表关闭时间问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								5fbf9345bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c13d372634
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix' into dev
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								c9442573eb
								
							
								
							
						 | 
						
							
							
								
								解决议题已关闭列表关闭时间取错的问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								448682ec94
								
							
								
							
						 | 
						
							
							
								
								漏提文件
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								019e387d16
								
							
								
							
						 | 
						
							
							
								
								解决查询树结构问题
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								3642990e25
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								f99c16f3e9
								
							
								
							
						 | 
						
							
							
								
								修复异常拦截器配置错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2154c6fe06
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								bb10f56796
								
							
								
							
						 | 
						
							
							
								
								小程序可下载域名中添加阿里云域名地址
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b0357c4415
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev'
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6e642a4283
								
							
								
							
						 | 
						
							
							
								
								小程序可下载域名中添加阿里云域名地址
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ac3be14a2b
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								22f8a75caf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								c7f1477911
								
							
								
							
						 | 
						
							
							
								
								查找feign掉不通的bug
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								caf7280b51
								
							
								
							
						 | 
						
							
							
								
								给难点赌点增加日志输出用来排查错误 难点赌点服务升级   80 - 81
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								wangchao
							
						 | 
						
							
							
							
								
							
								6bef7b8cc0
								
							
								
							
						 | 
						
							
							
								
								给难点赌点增加日志输出用来排查错误
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								205274ffcc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0fc5b00ae0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_voice_share_point' into dev_project_branch
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java 
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								a62a77c4dd
								
							
								
							
						 | 
						
							
							
								
								项目全部
							
							
							
							
								
							
							
						 | 
						5 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								c321e6aa45
								
							
								
							
						 | 
						
							
							
								
								议题-全部
							
							
							
							
								
							
							
						 | 
						5 years ago |