yinzuomei
|
2c627da410
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
ec98876849
|
2023-03-08 00:00
|
3 years ago |
|
yinzuomei
|
1832769305
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
6dd7b8be72
|
/sys/log/operation/page
|
3 years ago |
|
yinzuomei
|
d3423b0120
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
3ee0a5b718
|
dingResiLogin
|
3 years ago |
|
yinzuomei
|
f1f9e4175a
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
36fc9b4664
|
shishi
|
3 years ago |
|
yinzuomei
|
d87d02d37a
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
ca6d57f533
|
certification/add-autopass记录agencyId
|
3 years ago |
|
yinzuomei
|
22f354e47c
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
43bd4612ce
|
certification/add-autopass不自动通过
|
3 years ago |
|
yinzuomei
|
4eb317f1c3
|
/epmetuser/more/badge/certification/detail返回gridName
|
3 years ago |
|
yinzuomei
|
b51d00bf19
|
epmetuser/more/badge/certification/detail;UserBaseInfoRedis.java:225;NullPointerException
|
3 years ago |
|
yinzuomei
|
254c54b2f2
|
epmetuser/more/badge/certification/detail;UserBaseInfoRedis.java:225;NullPointerException
|
3 years ago |
|
yinzuomei
|
872ed1f71c
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
d00f3d2e44
|
徽章详情，返回gridName
|
3 years ago |
|
yinzuomei
|
20d9017c0c
|
badge-options
|
3 years ago |
|
yinzuomei
|
e7ebf28eb7
|
gov-voice表，改为让李晓康执行
|
3 years ago |
|
yinzuomei
|
d20b627c6f
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
yinzuomei
|
e0fb48a4ba
|
Merge remote-tracking branch 'origin/房屋tree_yzm'
|
3 years ago |
|
yinzuomei
|
56a15091cc
|
让李小康执行sql
|
3 years ago |
|
yinzuomei
|
1ce84cf1b0
|
Merge remote-tracking branch 'origin/房屋tree_yzm'
|
3 years ago |
|
yinzuomei
|
99be2c8f65
|
user_badge_certificate_record增加agency_id
|
3 years ago |
|
yinzuomei
|
9bbf3e6264
|
Merge branches 'yantai_zhengwu_master' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master
|
3 years ago |
|
yinzuomei
|
afca6dcb05
|
pc端徽章审核-分页列表:badge/audit-page-list，todo
|
3 years ago |
|
yinzuomei
|
859174c09b
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
a386bb2f7f
|
listhomeuserbrief-encrypt/{houseId}
|
3 years ago |
|
yinzuomei
|
a2c00f431f
|
/gov/org/house/group-rent-house-list
|
3 years ago |
|
yinzuomei
|
5b8a485075
|
orgIdPath
|
3 years ago |
|
yinzuomei
|
4c1e43cd72
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
66d975ecf3
|
orgIdPath
|
3 years ago |
|
yinzuomei
|
1d8139f7d3
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
# Conflicts:
# epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java
# epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
# epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
# epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
|
3 years ago |
|
yinzuomei
|
286627c518
|
formDTO
|
3 years ago |
|
yinzuomei
|
f1fdc53338
|
/gov/voice/article/article-list-ytding
|
3 years ago |
|
yinzuomei
|
a6a614f703
|
/gov/voice/article/article-list-ytding
|
3 years ago |
|
yinzuomei
|
2f27344841
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
dc5ca02957
|
getAgencyTag/{gridId}
|
3 years ago |
|
yinzuomei
|
6c3ccd534a
|
wuti
|
3 years ago |
|
yinzuomei
|
52eda3ffb0
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev
|
3 years ago |
wxz
|
dcf7c18325
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wxz
|
a15de73262
|
增加minio相关类
|
3 years ago |
|
yinzuomei
|
e56d726fc6
|
wuti
|
3 years ago |
|
yinzuomei
|
06ea25a592
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
df61b90895
|
clearCustomerTag
|
3 years ago |
|
yinzuomei
|
5b97ec5ddc
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
|
yinzuomei
|
ef13a85491
|
初始化标应用范围
|
3 years ago |
|
yinzuomei
|
8be4ecfaf2
|
去掉agencyName
|
3 years ago |
|
yinzuomei
|
52f195a0a2
|
标签记录orgIdPath
|
3 years ago |
|
yinzuomei
|
01a4eeab9c
|
Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev
|
3 years ago |
