jianjun
|
dae73c9c1d
|
Merge remote-tracking branch 'origin/shibei_master' into shibei_master
|
4 years ago |
|
jianjun
|
0f622d4765
|
Merge branch 'dev_shibei_match' of http://git.elinkit.com.cn:7070/r/epmet-cloud into shibei_master
|
4 years ago |
|
jianjun
|
6cd21244d6
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_shibei_match
|
4 years ago |
zxc
|
6702a1de2e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
688dd89a2b
|
社区自组织导出
|
4 years ago |
|
jianjun
|
c78b85f332
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
ef54b6f87a
|
去掉线程
|
4 years ago |
|
jianjun
|
e9a6bb74d7
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
78c493239c
|
难点堵点 只差查近10天的结案数据和未结案的所有数据
|
4 years ago |
wangxianzhang
|
bfaed1268e
|
修改：
密码生成类
|
4 years ago |
|
jianjun
|
8b3c365abc
|
难点堵点1000
|
4 years ago |
|
jianjun
|
44dde15bbf
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
2443d35ab4
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java
|
4 years ago |
|
jianjun
|
6595f51a22
|
难点堵点 优化步骤1
|
4 years ago |
sunyuchao
|
492a6a06b2
|
.
|
4 years ago |
|
sunyuchao
|
726b5a45e2
|
bug修改
|
4 years ago |
|
jianjun
|
b848e1082e
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_match' into shibei_master
|
4 years ago |
|
jianjun
|
e4ba945648
|
市北登陆2
|
4 years ago |
|
jianjun
|
84ec95c237
|
市北登陆
|
4 years ago |
yinzuomei
|
fccd975e0e
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
2b8e09929d
|
/gov/org/agency/agencydetail
|
4 years ago |
|
yinzuomei
|
453e9569d0
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
yinzuomei
|
60a3474a1c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
ffcfcd9409
|
根组织不允许修改
|
4 years ago |
|
jianjun
|
5cf2ba01a4
|
stats ext 3g
|
4 years ago |
|
yinzuomei
|
19183cf986
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
281a0c9bc9
|
test
|
4 years ago |
|
yinzuomei
|
8b8a682740
|
+->,眼聋了
|
4 years ago |
|
yinzuomei
|
6860da8d6c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
f4279b481b
|
msg
|
4 years ago |
|
yinzuomei
|
2b01d18059
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
30cba2794b
|
自定义编码，名称已存在，提示给用户
|
4 years ago |
|
yinzuomei
|
c539a319cb
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
9e1ac20c36
|
自定义组织区划代码不允许修改
|
4 years ago |
|
yinzuomei
|
2d4c0c8641
|
编辑，选择其他，自定义编码
|
4 years ago |
|
jianjun
|
d0bf58b25e
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_routine_work
|
4 years ago |
|
jianjun
|
3f2323b1d8
|
pageNo+1
|
4 years ago |
|
wangxianzhang
|
5e507da40b
|
修改：
错误的import类
|
4 years ago |
|
jianjun
|
586d7fed07
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e579bd4e3e
|
Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
0dfa97a374
|
pageNo+1
|
4 years ago |
|
yinzuomei
|
641c82124c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
f8fb7fe895
|
bugfix
|
4 years ago |
|
yinzuomei
|
6700e048e7
|
修改了组织的areaCode， 部门和网格的置为空
|
4 years ago |
|
wangxianzhang
|
aafae67c07
|
修改redis端口为10001
|
4 years ago |
|
yinzuomei
|
aecf8c8245
|
修改组织
|
4 years ago |
|
zxc
|
7e9cc572a8
|
预约日期校验
|
4 years ago |
|
wangxianzhang
|
83fb45c5ad
|
Merge remote-tracking branch 'origin/shibei_master' into shibei_master
|
4 years ago |
|
jianjun
|
9ec8e267a9
|
jwt秘钥调整
|
4 years ago |
|
yinzuomei
|
c994dd5ee0
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
