yinzuomei
|
c5d7b6b687
|
Merge remote-tracking branch 'origin/dev_qr_code' into dev
|
3 years ago |
zxc
|
ae9c2fe264
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
64865d6c1d
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
zxc
|
bec8cb2afe
|
采集列表微调
|
3 years ago |
jianjun
|
e905be8755
|
上传文档
|
3 years ago |
|
yinzuomei
|
e6a6976518
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
914b3e8c82
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
yinzuomei
|
8930f00674
|
前端做校验
|
3 years ago |
|
yinzuomei
|
671b754a8c
|
前端做校验
|
3 years ago |
|
yinzuomei
|
666971bdc9
|
成员只限制姓名身份证号必填
|
3 years ago |
|
jianjun
|
3432c7f617
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
c20ed2c3af
|
Merge branch 'dev_qr_code' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
8087817caf
|
二维码升级并设置文字间距
|
3 years ago |
|
jianjun
|
30601f5d8a
|
二维码升级并设置文字间距 up
|
3 years ago |
|
jianjun
|
8c8def4128
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
99f9143603
|
Merge remote-tracking branch 'remotes/origin/dev_qr_code' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
|
3 years ago |
|
jianjun
|
130f22d087
|
二维码升级并设置文字间距
|
3 years ago |
|
jianjun
|
1d910323c2
|
域名替换为open up
|
3 years ago |
|
jianjun
|
9419816afe
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
348c42452a
|
域名替换为open
|
3 years ago |
|
jianjun
|
f8a8e2b09d
|
手机信息上线 up
|
3 years ago |
|
jianjun
|
8905299ebd
|
手机信息上线 up
|
3 years ago |
|
jianjun
|
9efd3d8528
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
9b13c33f6f
|
手机信息上线 up
|
3 years ago |
|
jianjun
|
8ba34416c4
|
Merge remote-tracking branch 'remotes/origin/dev_qr_code' into dev
|
3 years ago |
|
zxc
|
08d582c817
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
2d078fce1e
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
zxc
|
0b53e6e032
|
name encode
|
3 years ago |
|
zxc
|
5207675425
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
zxc
|
fd988cd183
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
zxc
|
edccc24487
|
encode
|
3 years ago |
|
yinzuomei
|
0a166c06c6
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
8ead329b23
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
yinzuomei
|
014aff5953
|
1
|
3 years ago |
|
yinzuomei
|
32001a2310
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
yinzuomei
|
6f091f414c
|
notnull
|
3 years ago |
|
yinzuomei
|
cb15944e33
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
yinzuomei
|
793cec8d68
|
成员相关信息校验
|
3 years ago |
|
jianjun
|
be71141ff6
|
Merge remote-tracking branch 'remotes/origin/dev_qr_code' into dev
|
3 years ago |
|
yinzuomei
|
83b7a24e50
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
ee24d2a928
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
yinzuomei
|
4cbccbca19
|
居民信息采集表26
|
3 years ago |
|
yinzuomei
|
79a083bdff
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
3 years ago |
|
yinzuomei
|
6a2deadce9
|
Merge remote-tracking branch 'origin/dev_qr_code' into develop
|
3 years ago |
|
yinzuomei
|
68fb0790dd
|
居民信息采集表
|
3 years ago |
|
jianjun
|
f08678d3f1
|
组织树添加临时缓存 要不然前端容易挂 bug
|
3 years ago |
|
jianjun
|
f9ac648849
|
组织树添加临时缓存 要不然前端容易挂 bug
|
3 years ago |
|
jianjun
|
4aecb4aeb4
|
Merge remote-tracking branch 'origin/release_temp' into 主线测试
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java
|
3 years ago |
|
jianjun
|
4fae090288
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试
|
3 years ago |
|
jianjun
|
a14e1bc313
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
|
3 years ago |
