sunyuchao
|
476f80f564
|
Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide
|
6 years ago |
|
sunyuchao
|
559618560f
|
Merge branch 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
# epmet-module/resi-guide/resi-guide-server/pom.xml
|
6 years ago |
yangshaoping
|
0370b476be
|
陌生人访问记录表 --和王朝合并版
|
6 years ago |
wangchao
|
622a4de1ff
|
修改接口：根据位置授权/不授权选定附近网格信息,加注释,加数据校验
|
6 years ago |
|
wangchao
|
45500e73b9
|
修改接口：根据位置授权/不授权选定附近网格信息（后期需要加redis提高查询效率）
|
6 years ago |
yinzuomei
|
59011c7616
|
登录接口修改
|
6 years ago |
|
wangchao
|
65c26f2eed
|
authlogin分支
|
6 years ago |
|
yinzuomei
|
d03f448d68
|
feign测试
|
6 years ago |
|
wangchao
|
fad2f05668
|
authlogin分支
|
6 years ago |
|
sunyuchao
|
ef5c834105
|
update resi to local repoitory
|
6 years ago |
|
sunyuchao
|
9a9b7de5c3
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
yinzuomei
|
d517ca6a1d
|
验证码
|
6 years ago |
|
yinzuomei
|
e6b779bc00
|
修改feign配置
|
6 years ago |
|
yinzuomei
|
54401f4b41
|
手机号密码登录接口修改
|
6 years ago |
|
yinzuomei
|
8dacc3a832
|
feignbug修改，token规则修改
|
6 years ago |
|
yinzuomei
|
29dc99bed9
|
REGION改为varchar注释：所属区域：titleList.标题区、topList.置顶区、functionList.功能区、floatingList.悬浮区
|
6 years ago |
|
yangshaoping
|
62dd732efc
|
完善根据客户id,所属端获取客户首页配置的设计稿-regin数据类型由int 改为varchar(涉及3个相关表草稿表-模板表-组件表都改了)
|
6 years ago |
|
yinzuomei
|
87e7545970
|
新增获取验证码接口/auth/login/captcha
|
6 years ago |
|
yinzuomei
|
16496f7b6d
|
更改居民端小程序appId和appsecret
|
6 years ago |
|
yangshaoping
|
203625ea7f
|
完善根据客户id,所属端获取客户首页配置的设计稿-添加枚举类引用判断改名称
|
6 years ago |
|
yinzuomei
|
9953ddcae1
|
去除feign url
|
6 years ago |
|
yangshaoping
|
16e93abf16
|
完善根据客户id,所属端获取客户首页配置的设计稿-添加枚举类引用判断
|
6 years ago |
|
wangchao
|
7db67f2594
|
陌生人导览模块，授权/不授权位置信息时查询网格信息
|
6 years ago |
|
yinzuomei
|
970fc187f1
|
Merge branch 'dev1.0' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
|
6 years ago |
|
yinzuomei
|
12ca9a252f
|
登录接口初始提交
|
6 years ago |
|
yangshaoping
|
66ce1ca839
|
完善根据客户id,所属端获取客户首页配置的设计稿-sql变更--添加删除条件
|
6 years ago |
|
yangshaoping
|
58e49a105e
|
Merge branches 'dev1.0-authlogin', 'dev1.0-opercustomize' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-opercustomize
|
6 years ago |
|
yangshaoping
|
50a775ac70
|
完善根据客户id,所属端获取客户首页配置的设计稿-注释信息
|
6 years ago |
|
wangchao
|
3cb94056e3
|
Merge branch 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
wangchao
|
97744844ed
|
陌生人导览模块，授权/不授权位置信息时查询网格信息
|
6 years ago |
|
sunyuchao
|
11f2122c86
|
Merge branch 'dev1.0-opercustomize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
sunyuchao
|
298618adb2
|
服务配置
|
6 years ago |
|
sunyuchao
|
c1ce6f4e59
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
wangchao
|
45eed275dd
|
主pom文件里删除原gov-org模块依赖
|
6 years ago |
hosinokamui
|
a5b5d2ad65
|
修改 首页设计稿保存，首页设计稿发版api删除数据改为逻辑删除
|
6 years ago |
|
sunyuchao
|
cd23d6973d
|
Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide
|
6 years ago |
|
wangchao
|
bc0ad38a33
|
政府组织模块移到epmet-module模块下，epmet-module的pom文件中删除原epmet-api的引用，修改epmet-gateway中bootstap.yaml中配置的路由order信息，修改gov-org-server的默认端口号为8092
|
6 years ago |
|
wangchao
|
9fd480acfb
|
政府组织模块移到epmet-module模块下，epmet-module的pom文件中删除原epmet-api的引用，修改epmet-gateway中bootstap.yaml中配置的路由order信息，修改gov-org-server的默认端口号为8092
|
6 years ago |
|
hosinokamui
|
21c58a0fa0
|
首页设计稿保存，首页设计稿发版api代码重构
|
6 years ago |
|
yangshaoping
|
7fb7492f94
|
Merge remote-tracking branch 'origin/dev1.0-opercustomize' into dev1.0-opercustomize
|
6 years ago |
|
wangchao
|
a60d9c1c7b
|
Merge remote-tracking branch 'origin/dev1.0-resiguide' into dev1.0-resiguide
|
6 years ago |
|
wangchao
|
5bf4652ecc
|
政府端
|
6 years ago |
|
wangchao
|
b4d568f96d
|
新增政府端组织模块，数据库从epmet_oper_business更换为epmet_gov_org，表名不变
|
6 years ago |
|
hosinokamui
|
958b1fb8a4
|
首页设计稿保存，首页设计稿发版api实现
|
6 years ago |
|
yangshaoping
|
9d8935b19c
|
Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-opercustomize
|
6 years ago |
|
sunyuchao
|
0579101032
|
数据库表代码生成
|
6 years ago |
|
yangshaoping
|
4060895be1
|
获取客户首页配置的设计稿-代码测试版
|
6 years ago |
|
yangshaoping
|
9a7af6ea3c
|
获取客户首页配置的设计稿-代码提交2
|
6 years ago |
|
sunyuchao
|
63b23cc521
|
数据库变动 删除代码
|
6 years ago |
|
yinzuomei
|
b8b8ce3f9f
|
Merge branch 'dev1.0' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin
|
6 years ago |
