yinzuomei
							
						 | 
						
							
							
							
								
							
								666971bdc9
								
							
								
							
						 | 
						
							
							
								
								成员只限制姓名身份证号必填
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c20ed2c3af
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_qr_code' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8087817caf
								
							
								
							
						 | 
						
							
							
								
								二维码升级并设置文字间距
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								99f9143603
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_qr_code' into dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								130f22d087
								
							
								
							
						 | 
						
							
							
								
								二维码升级并设置文字间距
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								348c42452a
								
							
								
							
						 | 
						
							
							
								
								域名替换为open
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8ba34416c4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_qr_code' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0b53e6e032
								
							
								
							
						 | 
						
							
							
								
								name encode
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								edccc24487
								
							
								
							
						 | 
						
							
							
								
								encode
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								014aff5953
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6f091f414c
								
							
								
							
						 | 
						
							
							
								
								notnull
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								793cec8d68
								
							
								
							
						 | 
						
							
							
								
								成员相关信息校验
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								be71141ff6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_qr_code' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4cbccbca19
								
							
								
							
						 | 
						
							
							
								
								居民信息采集表26
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								68fb0790dd
								
							
								
							
						 | 
						
							
							
								
								居民信息采集表
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f08678d3f1
								
							
								
							
						 | 
						
							
							
								
								组织树添加临时缓存 要不然前端容易挂 bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f9ac648849
								
							
								
							
						 | 
						
							
							
								
								组织树添加临时缓存 要不然前端容易挂 bug
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								cef8129dd5
								
							
								
							
						 | 
						
							
							
								
								组织树添加临时缓存 要不然前端容易挂
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								c5b635a551
								
							
								
							
						 | 
						
							
							
								
								org dockerfile增加字体文件拷贝,供二维码中文字使用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8518e36ba5
								
							
								
							
						 | 
						
							
							
								
								删除字体
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a31d810ee2
								
							
								
							
						 | 
						
							
							
								
								不知道
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								9eee9b5476
								
							
								
							
						 | 
						
							
							
								
								不知道
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								87354c931f
								
							
								
							
						 | 
						
							
							
								
								通知描述
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								77422c241c
								
							
								
							
						 | 
						
							
							
								
								字体添加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6fac54c3ac
								
							
								
							
						 | 
						
							
							
								
								字体添加
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								61e04646de
								
							
								
							
						 | 
						
							
							
								
								id
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f4ea4f3c8a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								074e9c33aa
								
							
								
							
						 | 
						
							
							
								
								Revert "添加字体"
							
							
							
							
							
							
								
							
							
							This reverts commit fc172ced 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2487bc300a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d2165c5836
								
							
								
							
						 | 
						
							
							
								
								bianyibaocuo
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								3228c8e5c5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								08ac63aabb
								
							
								
							
						 | 
						
							
							
								
								等会
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								678b8ee8db
								
							
								
							
						 | 
						
							
							
								
								类型
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8fe0b71a8d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8e01db3f11
								
							
								
							
						 | 
						
							
							
								
								houseType、heSuanCount=》String
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d23393e94b
								
							
								
							
						 | 
						
							
							
								
								add customerId
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								975a891c73
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ba37aa9688
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								fc172ced45
								
							
								
							
						 | 
						
							
							
								
								添加字体
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								791871f34a
								
							
								
							
						 | 
						
							
							
								
								list
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e13e2e91cb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_qr_code' into dev_qr_code
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								362d3cbb2a
								
							
								
							
						 | 
						
							
							
								
								d
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								dba18b4b18
								
							
								
							
						 | 
						
							
							
								
								list
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								03db35912b
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2dbbab3d7f
								
							
								
							
						 | 
						
							
							
								
								提交信息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b3b1d8d6fc
								
							
								
							
						 | 
						
							
							
								
								and
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								eae632be5d
								
							
								
							
						 | 
						
							
							
								
								houseHolderName
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0dca863fed
								
							
								
							
						 | 
						
							
							
								
								heSuanCount+houseType
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b8732f0a33
								
							
								
							
						 | 
						
							
							
								
								通知修改为中文
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b5f747641d
								
							
								
							
						 | 
						
							
							
								
								cuole
							
							
							
							
								
							
							
						 | 
						4 years ago |