Tree: 06bb4971bf

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '06bb4971bf'

${ noResults }

Commit Graph

20794 Commits (06bb4971bf754a50ba1043e51219c475fc95f23c)

 

All Branches   

Search

Author	SHA1	Message	Date
zhangyuan	cf126e6f6d	Merge branch 'back_contract' into back	3 years ago
zhangyuan	59481feec8	更改附件实体类的字段	3 years ago
zhangyuan	45f814c3b0	Merge branch 'back_contract' into back	3 years ago
zhangyuan	bc683f5f85	更新接收tokendto	3 years ago
jianjun	b818dec118	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into back	3 years ago
jianjun	d49fdf513a	修改密码接口 修改app	3 years ago
jianjun	2c8c91433b	修改密码接口 修改方法	3 years ago
jianjun	bb7b791dd7	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	3 years ago
jianjun	ec3981e40a	修改密码接口	3 years ago
sunyuchao	77db6d47ef	Merge branch 'dev_bugfix_ljj' into back	3 years ago
sunyuchao	bac2917190	应前端要求 接口入参不再传appId值	3 years ago
jianjun	2da0272b44	添加动力主轴服务 2	3 years ago
jianjun	199416f7c6	添加动力主轴服务	3 years ago
zhangyuan	af2b12cd31	Merge branch 'back' of http://121.42.41.42:7070/r/epmet-cloud into back	3 years ago
zhangyuan	fd0ffff2b4	合同管理代码	3 years ago
jianjun	e8799c1232	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into back	3 years ago
yinzuomei	28e3d7c64d	/api/gov/org/customergrid/gridoption放开权限	3 years ago
zhangyuan	b540c5ca6d	丢失的代码	3 years ago
zhangyuan	a41a92030f	Merge branch 'master' into dev_contract	3 years ago
zhangyuan	b63e4c1c21	Merge branch 'dev'	3 years ago
zhangyuan	8d01bec297	Merge branch 'develop' into dev	3 years ago
zhangyuan	73d8eb4664	bug	3 years ago
zhangyuan	fee3e5cfae	Merge branch 'dev' # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	3 years ago
zhangyuan	1f13a4a13b	Merge branch 'dev_contract' into dev	3 years ago
jianjun	8cb6a23b64	微调	3 years ago
jianjun	1f944cf58f	Merge remote-tracking branch 'remotes/origin/dev' # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	3 years ago
jianjun	ae949b6adc	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	3 years ago
jianjun	429cf2841e	Merge remote-tracking branch 'remotes/origin/dev' into dev_resi_export # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java	3 years ago
zhaoqifeng	538d97d87d	Merge branch 'dev_bugfix_ljj' into dev	3 years ago
jianjun	e6017c4465	这个代码被删除了 恢复	3 years ago
zhaoqifeng	45267e787c	Merge branch 'dev_bugfix_ljj' into develop	3 years ago
zhaoqifeng	022c7acba3	list转map key重复	3 years ago
jianjun	25cea0f695	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	edfe9b063c	导出返回错误信息 2	3 years ago
jianjun	8a137c95d1	Merge remote-tracking branch 'origin/develop' into develop	3 years ago
jianjun	bba26ecfd6	Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop	3 years ago
jianjun	dbf7001c1b	Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export	3 years ago
jianjun	e387fca7de	导出返回错误信息	3 years ago
sunyuchao	c3501ec3f0	Merge branch 'dev_resi_export' into develop	3 years ago
sunyuchao	d1f3d208c9	bug修改，增加同组织下模板名不能重复校验	3 years ago
jianjun	d2f583f1ee	代码微调	3 years ago
jianjun	4caebaf21c	代码微调	3 years ago
zxc	7ec121058a	Merge branch 'dev_import_edit' into develop	3 years ago
zxc	6957c75b66	小区导入	3 years ago
zxc	437a160b21	Merge branch 'dev_resi_export' into develop	3 years ago
zxc	40d6c23b75	排序修改	3 years ago
zhangyuan	30f7486688	Merge branch 'dev_contract' into develop	3 years ago
zhangyuan	94b17f2240	bug，entity没有改字段	3 years ago
zhangyuan	e49c1531c0	Merge branch 'dev_contract' into develop	3 years ago
zhangyuan	86bbbc346a	改一下存储头像写法	3 years ago