wangchao
|
ac1a0cb579
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wangchao
|
2c06ecd592
|
进入网格相关代码
|
6 years ago |
yinzuomei
|
15fe632a3d
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
074c07ef3f
|
新增群成员列表、待审核成员列表、同意入群、拒绝入群
|
6 years ago |
sunyuchao
|
aba2e9f711
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
sunyuchao
|
57f2a372ca
|
代码生成xml文件路径错误修改问题
|
6 years ago |
|
yinzuomei
|
1ffd94f545
|
EpmetErrorCode待确认
|
6 years ago |
|
sunyuchao
|
dce760417e
|
公参拼写错误修改
|
6 years ago |
|
wangchao
|
cbbad312d0
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
wangchao
|
beaf0b893a
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
b212fcac0d
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
9628b46793
|
新增EpmetErrorCode、EpmetRoleKeyConstant
|
6 years ago |
|
wangchao
|
f9bec86c6b
|
UserAccessService
|
6 years ago |
|
sunyuchao
|
d23c8ffc93
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
sunyuchao
|
19aa824bc6
|
添加党员认证、热心居民申请端访问权限控制
|
6 years ago |
|
yinzuomei
|
e7b982a9d1
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
yinzuomei
|
53a28d326a
|
新增initapplycreategroup接口
|
6 years ago |
|
wangchao
|
aa52648f60
|
Merge remote-tracking branch 'origin/dev0.2' into dev0.2
|
6 years ago |
|
wangchao
|
21062aeea6
|
enterGrid相关
|
6 years ago |
|
sunyuchao
|
89e0e1ddd6
|
实体DTO字段名修改
|
6 years ago |
|
wangchao
|
94e6274613
|
根据app、用户Id、客户Id查询用户的角色列表。
|
6 years ago |
|
sunyuchao
|
5e1f5d4062
|
居民注册页面初始化注册访问记录表新增数据接口
|
6 years ago |
|
yinzuomei
|
391ad82af0
|
loginByWxCode、loginByPassword接口修改，删除customer_user相关代码
|
6 years ago |
|
wangchao
|
9956a4cd5f
|
Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2
|
6 years ago |
|
wangchao
|
5fbd3029e2
|
用户entergrid
|
6 years ago |
|
yinzuomei
|
59cce5e2e2
|
resi-group新增initapplygroup接口,epmet-user新增根据客户id、用户id查询居民注册信息接口
|
6 years ago |
|
sunyuchao
|
d57edceed1
|
居民热心居民党员业务代码生成
|
6 years ago |
|
yinzuomei
|
1be49682d5
|
实现group部分接口,新增我的消息
|
6 years ago |
|
wangchao
|
3d857c5dbf
|
auth的userFeign去掉url
|
6 years ago |
|
wangchao
|
764615519b
|
居民用户微信登录接口修改
|
6 years ago |
|
wangchao
|
5e1f0b7c67
|
修改运营端登录接口，居民用户微信登录接口
|
6 years ago |
|
wangchao
|
c0428dc9fd
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
|
6 years ago |
|
yinzuomei
|
e59f3077ed
|
新增resi-group,resi-partymember
|
6 years ago |
|
yinzuomei
|
30f9bc2e0f
|
demo模块修改
|
6 years ago |
|
yinzuomei
|
b450c442f6
|
Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-opercustomize
|
6 years ago |
|
yinzuomei
|
79599584d3
|
redis连接改为10.10.10.77
|
6 years ago |
|
yinzuomei
|
abf0965b54
|
命名规范修改
|
6 years ago |
|
wangchao
|
9863e1ca0c
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
|
6 years ago |
|
yinzuomei
|
a9f93217c4
|
登陆bug修改，获取网格信息bug修改
|
6 years ago |
|
wangchao
|
76b609a6b7
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
|
6 years ago |
|
wangchao
|
27ceea8e02
|
gateway pom.xml
|
6 years ago |
|
yinzuomei
|
0684996bdd
|
ResiMineGridController入口改为mygrid
|
6 years ago |
|
yinzuomei
|
494f978601
|
gateway修改resimine服务地址
|
6 years ago |
|
yinzuomei
|
43f2b0f5c1
|
Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-opercustomize
|
6 years ago |
|
wangchao
|
22007969eb
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
|
6 years ago |
|
wangchao
|
56a5ddb7af
|
FeignClient去掉url
|
6 years ago |
|
yinzuomei
|
d8d86efa14
|
Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java
epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
|
6 years ago |
|
yinzuomei
|
12f23a770b
|
新增resi-mine
|
6 years ago |
|
wangchao
|
8b7d8f37a7
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0
|
6 years ago |
|
wangchao
|
4276d44c19
|
FeignClient去掉url
|
6 years ago |
