sunyuchao
|
ebbb7ba0f1
|
Merge branch 'dev_project_approval' into dev_temp
|
5 years ago |
|
sunyuchao
|
00c4cd3758
|
项目立项20字限制
|
5 years ago |
|
sunyuchao
|
580a7c6dd2
|
Merge branch 'dev_isDomainName' into dev_temp
|
5 years ago |
|
sunyuchao
|
347b41c45b
|
升级版本
|
5 years ago |
|
sunyuchao
|
478ca8620b
|
Merge branches 'dev_flyway_scripts' and 'dev_project_approval' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_project_approval
|
5 years ago |
|
sunyuchao
|
5803d95822
|
Merge branch 'dev_isDomainName' into dev_temp
|
5 years ago |
|
sunyuchao
|
e406e839a4
|
服了
|
5 years ago |
|
sunyuchao
|
043bd455fe
|
还原
|
5 years ago |
|
sunyuchao
|
ca78dbc4ae
|
废弃
|
5 years ago |
|
sunyuchao
|
4c11c43298
|
Merge branch 'dev_isDomainName' into dev_temp
|
5 years ago |
|
sunyuchao
|
67a7d3f385
|
脑壳疼
|
5 years ago |
|
sunyuchao
|
42bbccff6d
|
Merge branch 'dev_isDomainName' into dev_temp
|
5 years ago |
|
sunyuchao
|
415c571888
|
运营端定制功能业务域名设置非必填
|
5 years ago |
|
sunyuchao
|
6c40a0c2c2
|
不在使用此分支管理sql脚本
|
5 years ago |
jianjun
|
847f965d4e
|
去掉日志
|
5 years ago |
|
jianjun
|
4126bfac2c
|
Merge branch 'dev_project_approval' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
jianjun
|
aee14fadb9
|
公用参数不能随意修改
|
5 years ago |
|
jianjun
|
595d51ddb0
|
Merge remote-tracking branch 'remotes/origin/dev_project_approval' into dev_temp
|
5 years ago |
|
jianjun
|
928db2055f
|
公用参数不能随意修改
|
5 years ago |
|
jianjun
|
5b5c8e9618
|
Merge remote-tracking branch 'remotes/origin/dev_project_approval' into dev_temp
|
5 years ago |
|
jianjun
|
77174f92a1
|
神奇的错误
|
5 years ago |
zxc
|
d8fb95f8fe
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
5 years ago |
|
zxc
|
6df4119682
|
审核通过时，添加小组类型
|
5 years ago |
|
sunyuchao
|
ebf745bf6b
|
小组通知详情
|
5 years ago |
yinzuomei
|
470d742651
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
yinzuomei
|
3f5e652147
|
发布/编辑活动
|
5 years ago |
|
sunyuchao
|
184adf4a62
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
sunyuchao
|
386001d926
|
通知已读未读列表查询
|
5 years ago |
|
zxc
|
525764588c
|
创建小组修改不是党员不能创建支部小组，
待审核的小组列表反参添加groupType
|
5 years ago |
|
sunyuchao
|
c81c9c66d3
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
sunyuchao
|
2dd616a619
|
小组通知、活动分享
|
5 years ago |
|
yinzuomei
|
40ce017e74
|
8905错误编码
|
5 years ago |
|
yinzuomei
|
58cd53468f
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
yinzuomei
|
a36e5444ef
|
楼院小组新增错误编码，8903、8904
|
5 years ago |
|
sunyuchao
|
6b1a6192d7
|
小组通知变更
|
5 years ago |
|
yinzuomei
|
ea11682f49
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
|
5 years ago |
|
yinzuomei
|
18bffe8aa1
|
楼院小组新增错误编码，8901、8902，日后楼院小组统一用89xx吧
|
5 years ago |
|
zxc
|
4d4f47c5e6
|
推荐小组添加 groupType，小组类型 ！= 支部
我的小组添加groupType
|
5 years ago |
|
zxc
|
6439fa4db0
|
创建小组添加 groupType
|
5 years ago |
|
zxc
|
eed1afa908
|
创建小组添加 groupType
|
5 years ago |
|
yinzuomei
|
61c2ed6ad7
|
Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
|
5 years ago |
|
yinzuomei
|
06467acabf
|
活动类别字典
|
5 years ago |
|
jianjun
|
60e5e3d8e2
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
5 years ago |
|
jianjun
|
5a2758b3a2
|
优化footBar方法
|
5 years ago |
|
sunyuchao
|
c723ecd776
|
编译
|
5 years ago |
|
sunyuchao
|
fa76242e0b
|
小组通知保存
|
5 years ago |
|
jianjun
|
b288edbbb8
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
5 years ago |
|
jianjun
|
705efe9d43
|
去掉多线程
|
5 years ago |
|
jianjun
|
233cc511c8
|
Merge remote-tracking branch 'remotes/origin/dev_time_out' into dev_temp
|
5 years ago |
|
jianjun
|
57dab627cc
|
开个线程试试
|
5 years ago |
