Tree: 1f3720f043

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '1f3720f043'

${ noResults }

Commit Graph

21189 Commits (1f3720f043fa97696e82c72236c69c68596ea64f)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	4a9d85f6c6	冲突了	3 years ago
yinzuomei	e2817da49e	Merge remote-tracking branch 'origin/dev_0608fix' into dev_0608fix # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml	3 years ago
yinzuomei	19f6e548ef	房屋列表：remark	3 years ago
zxc	2e0263fa35	remark	3 years ago
HAHA	a139a36a55	添加量化积分统计的逻辑	3 years ago
zxc	085ba12372	emm	3 years ago
HAHA	aa2142491a	新增修改逻辑	3 years ago
HAHA	a183ef5e4f	修改set字段	3 years ago
HAHA	846a8a281b	空指针修复	3 years ago
wangxianzhang	6e954ca9d1	修改：【居民信息导入】所属支部的查询调整	3 years ago
zhangyuan	53fc5eb722	Merge branch 'feature/statistical_zhy'	3 years ago
zhangyuan	3be8476f5d	防止空指针	3 years ago
HAHA	04b39e1768	判断	3 years ago
HAHA	d7b3dc1171	默认值0等等改	3 years ago
zhangyuan	eb05d02cf1	Merge branch 'feature/statistical_zhy'	3 years ago
HAHA	63efac033c	修改判断逻辑	3 years ago
zhangyuan	3890c7da3e	调整合计的位置	3 years ago
zxc	1e332de4fc	楼栋单元数修改	3 years ago
HAHA	f846648ee3	修改统计逻辑	3 years ago
zxc	cc6333cc46	房屋信息增加新的查询条件	3 years ago
sunyuchao	4f06cbdc05	Merge remote-tracking branch 'origin/master'	3 years ago
sunyuchao	75cebe497d	Merge branch 'dev_bugfix_ljj'	3 years ago
wangxianzhang	a2bcf00622	Merge branch 'bugfix_resiimport_agencyerror'	3 years ago
sunyuchao	58d959362c	居民信息修改 bug修复	3 years ago
jianjun	c547f89630	Merge remote-tracking branch 'remotes/origin/dev_zhili' # Conflicts: # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java # epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java	3 years ago
wangxianzhang	891aae733a	Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into bugfix_resiimport_agencyerror	3 years ago
zhaoqifeng	aa1c85c2a2	Merge branch 'dev_party_mange'	3 years ago
zxc	27e2ad1f33	协办单位微调	3 years ago
zhangyuan	679afd76cd	fly位置错误	3 years ago
zhangyuan	dddc7d8342	fly名称修改	3 years ago
zhangyuan	f2df81452f	flyway脚本	3 years ago
zhangyuan	798cbc69a9	同步原型图	3 years ago
zhangyuan	f08ccb7512	到处判断	3 years ago
zhaoqifeng	59709ee239	根据身份证判断居民在小程序端是否是志愿者	3 years ago
yinzuomei	468fc146c8	Merge remote-tracking branch 'origin/dev_zhili'	3 years ago
zhangyuan	bbfcb88f7b	增加合计	3 years ago
zhangyuan	b04805b471	完善导出	3 years ago
zhaoqifeng	85c48ee54b	根据身份证判断居民在小程序端是否是志愿者	3 years ago
zhangyuan	3727208391	调整统计的结果	3 years ago
yinzuomei	11ca6505d5	detail	3 years ago
zhangyuan	0397fc16e0	sql调整	3 years ago
zhangyuan	76dbe9aecd	无日期查询当日	3 years ago
wangxianzhang	6ff124cd4a	【居民信息导入】AGENCY_ID应该取所属网格的上级，而不是从当前登录人员的agencyId中取	3 years ago
zhangyuan	985b257a17	bug	3 years ago
jianjun	2053cd7eb0	Merge remote-tracking branch 'remotes/origin/dev_party_mange'	3 years ago
zhangyuan	5d842bacc6	完善页面查询	3 years ago
zhangyuan	b783eb4b01	修改统计逻辑	3 years ago
zhaoqifeng	77fc8e3e24	党员相关bug修改	3 years ago
zhangyuan	c3ec06ec2c	网格判断del=0	3 years ago
HAHA	d6b5fb9766	更新flyaway，删除经纬度逻辑	3 years ago