jianjun
|
88ec64694d
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev
|
3 years ago |
|
jianjun
|
34ad4fd2e9
|
去掉模板里 的黑线
|
3 years ago |
|
jianjun
|
757eb8dbca
|
去掉 高度设置
|
3 years ago |
|
jianjun
|
a18376cc33
|
长度增加
|
3 years ago |
|
jianjun
|
0d2f5578a1
|
忽略字段
|
3 years ago |
|
jianjun
|
4f81a57b24
|
easypoi和easyExcel导出 调整样式基本统一
|
3 years ago |
wangxianzhang
|
d18c6cfee1
|
Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
wangxianzhang
|
bd19ecf9e9
|
线程池包装，去掉重复包装，遗忘
|
3 years ago |
yinzuomei
|
d33133c2ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
yinzuomei
|
2d0c9323a0
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
yinzuomei
|
b994adfb02
|
bug#2768:user,gov-org
|
3 years ago |
zxc
|
2e3042128a
|
更改模板表头颜色
|
3 years ago |
|
zxc
|
a6f99b244f
|
项目得分接口微调
|
3 years ago |
|
wangxianzhang
|
b70e5a47c3
|
-
|
3 years ago |
|
wangxianzhang
|
e53f12d806
|
1.ttl线程池包装->TtlRunnable.getRunnable()包装，更彻底
|
3 years ago |
|
wangxianzhang
|
977ab776b2
|
-
|
3 years ago |
|
wangxianzhang
|
a50342c9f0
|
处理循环依赖
|
3 years ago |
|
yinzuomei
|
3f1fb0792b
|
多余
|
3 years ago |
|
yinzuomei
|
fb2211c83e
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation
|
3 years ago |
|
yinzuomei
|
6e125ceaf9
|
test
|
3 years ago |
|
wangxianzhang
|
685865774a
|
@Async=>@Async("executorService")
|
3 years ago |
|
yinzuomei
|
60c781971d
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev
|
3 years ago |
|
yinzuomei
|
af5bd46923
|
tokenqu
|
3 years ago |
|
jianjun
|
7dfbcb60ce
|
去掉长度
|
3 years ago |
|
wangxianzhang
|
9d7f33a07f
|
核酸检测、疫苗接种：增加手机号长度15位的验证
|
3 years ago |
|
wangxianzhang
|
67d91edace
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wangxianzhang
|
60da59242f
|
居民信息导入：增加身份证号和手机号的长度检查和错误提示
|
3 years ago |
|
zxc
|
c5e95458e6
|
具体错误信息修改
|
3 years ago |
|
zxc
|
048464b22c
|
emm
|
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
|
c1c27e0336
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
92fc169667
|
删掉无用的
|
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
|
7c762cc117
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_epidemic_situation
|
3 years ago |
|
jianjun
|
7e935366b0
|
去掉无用发发
|
3 years ago |
|
zxc
|
a7338f1a5b
|
加了个userId
|
3 years ago |
|
zxc
|
8847f4b3c5
|
加了个组织ID
|
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
|
c1e3a2b4bb
|
添加and a.status = 0
|
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
|
3beb70dfd8
|
需求变更，取消提示信息
|
3 years ago |
|
yinzuomei
|
bc2355b829
|
去掉校验，奇葩需求
|
3 years ago |
