wangxianzhang
|
a09885c0b9
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
67d91edace
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wangxianzhang
|
60da59242f
|
居民信息导入：增加身份证号和手机号的长度检查和错误提示
|
3 years ago |
zxc
|
5dd572867b
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
dd4877aee1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
3 years ago |
|
zxc
|
c5e95458e6
|
具体错误信息修改
|
3 years ago |
|
zxc
|
065dfd98e9
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
3 years ago |
|
zxc
|
048464b22c
|
emm
|
3 years ago |
|
zxc
|
b59cf5bd1d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
3 years ago |
|
zxc
|
161277c2ce
|
再修改房屋导入
|
3 years ago |
jianjun
|
18454127f2
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev
|
3 years ago |
|
jianjun
|
3bcac99c62
|
加强判断
|
3 years ago |
|
jianjun
|
547389148a
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
41a7a7beda
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
jianjun
|
c1c27e0336
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
92fc169667
|
删掉无用的
|
3 years ago |
|
jianjun
|
f3e326f5cc
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
b86854db40
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
jianjun
|
cfeca8ec30
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
de165865a7
|
删掉无用的
|
3 years ago |
|
jianjun
|
59cc5e50ae
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into 主线测试
|
3 years ago |
|
jianjun
|
1d1e5c2fd0
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into develop
|
3 years ago |
|
jianjun
|
7c762cc117
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_epidemic_situation
|
3 years ago |
|
jianjun
|
7e935366b0
|
去掉无用发发
|
3 years ago |
|
zxc
|
7023e806cc
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
0f640af746
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
zxc
|
a7338f1a5b
|
加了个userId
|
3 years ago |
|
zxc
|
904ad615a3
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
3 years ago |
|
zxc
|
54341f87f9
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
yinzuomei
|
bd3e5bae18
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
1896365f69
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
zxc
|
8847f4b3c5
|
加了个组织ID
|
3 years ago |
|
yinzuomei
|
eb32f699fa
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
yinzuomei
|
b25d8924b5
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
yinzuomei
|
4f675e4d0b
|
latestSubmit
|
3 years ago |
|
zxc
|
11c9a0ea79
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
8d1f879415
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
zxc
|
c1e3a2b4bb
|
添加and a.status = 0
|
3 years ago |
|
jianjun
|
1cda4ed61e
|
Merge remote-tracking branch 'origin/release_temp' into 主线测试
|
3 years ago |
|
jianjun
|
14c415ce50
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
e007eea552
|
Merge remote-tracking branch 'remotes/origin/dev' into develop
|
3 years ago |
|
jianjun
|
019284cd10
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
a82feb5d7e
|
中间库对接 巡查暂时不同步
|
3 years ago |
|
jianjun
|
9c7969d6a5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
ca9bc011dc
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
7a5ad46370
|
中间库对接 巡查暂时不同步
|
3 years ago |
|
zxc
|
1bbd2fdaeb
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
5a3c1bc25e
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
|
3 years ago |
|
zxc
|
3beb70dfd8
|
需求变更，取消提示信息
|
3 years ago |
|
yinzuomei
|
c7ed5eebd2
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
