sunyuchao
|
7d4a3b6f33
|
Merge branch 'dev_bugfix' into dev_temp
|
6 years ago |
|
sunyuchao
|
b27295beee
|
Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix
|
6 years ago |
|
sunyuchao
|
ea0bafb0ec
|
外挂接口添加返参
|
6 years ago |
|
sunyuchao
|
ab6eea084c
|
外挂接口添加返参
|
6 years ago |
zxc
|
c8f227d594
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
6 years ago |
wangchao
|
68a4284f27
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
6 years ago |
|
zxc
|
74ef1a6290
|
徽章修改
|
6 years ago |
|
wangchao
|
e63721dc5c
|
updateTimeFill
|
6 years ago |
|
zxc
|
abcaf53241
|
徽章修改
|
6 years ago |
|
wangchao
|
ccdf385ad4
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
6 years ago |
|
wangchao
|
fc47a49be5
|
updateFills时updatedTime为空再取now();insertFill时updatedBy为空去找createdBy没有再找从httpRequest中获取userId。如果不想被处理sql，insert或update时不要使用继承了BaseEpmetEntity的实体。
|
6 years ago |
|
sunyuchao
|
abce867f0d
|
Merge branch 'dev_personal_center' into dev_temp
|
6 years ago |
|
sunyuchao
|
fbf702839c
|
程序修改
|
6 years ago |
wxz
|
37d79c12c6
|
Merge branch 'dev_group_code' into dev_temp
|
6 years ago |
|
wxz
|
461e1dc7d2
|
小组二维码查询接口，url增加域名信息
|
6 years ago |
|
zxc
|
9a06b6940f
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
6 years ago |
|
zxc
|
2c54ebb84b
|
徽章修改
|
6 years ago |
|
sunyuchao
|
51fb140879
|
Merge branch 'dev_personal_center' into dev_temp
|
6 years ago |
|
wangchao
|
17ba3f1ee5
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
6 years ago |
liushaowen
|
3aa6dd178b
|
建议列表bug
|
6 years ago |
|
wangchao
|
fcd96fc8ba
|
mybatis元数据Handler填充updatedTime校验修改
|
6 years ago |
|
wxz
|
e54aedc2ff
|
Merge branch 'dev_group_code' into dev_temp
|
6 years ago |
|
wxz
|
02dce016f5
|
测试获取请求域名
|
6 years ago |
|
wangchao
|
d6b006dc8f
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
6 years ago |
|
wangchao
|
29e4122b8c
|
在审核通过时填充 审核通过人Id 审核通过的原因 生成的议题Id
|
6 years ago |
|
wangchao
|
caef601231
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
6 years ago |
|
wangchao
|
791059f25b
|
客户下线但是用户点亮的徽章在查询数据库时不应该被查出
|
6 years ago |
|
sunyuchao
|
945f47b21e
|
Merge branch 'dev_group_code' into dev_temp
|
6 years ago |
|
sunyuchao
|
cad2d16ff1
|
小组海报Bug修改
|
6 years ago |
|
wangchao
|
907f3a99cf
|
议题审核通过后生成相应的议题相关数据
|
6 years ago |
yinzuomei
|
cffcf1a753
|
issue_application新增APPROVE_STAFF_ID
|
6 years ago |
|
sunyuchao
|
3dd7e73900
|
Merge branch 'dev_bugfix' into dev
|
6 years ago |
|
sunyuchao
|
509c119286
|
对外接口添加权重返参
|
6 years ago |
|
yinzuomei
|
6518ca71ca
|
/data/report/screen/index/monthindexanalysis/barchart返参增加权重信息，四舍五入，保留小数点后两位
|
6 years ago |
|
yinzuomei
|
0c5895de6a
|
/data/report/screen/index/monthindexanalysis/barchart返参增加权重信息
|
6 years ago |
|
zxc
|
d05eda677b
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
6 years ago |
|
zxc
|
dc7d21534a
|
徽章修改
|
6 years ago |
zhaoqifeng
|
f6fb7d9fa4
|
Merge branch 'dev_personal_center' into dev_temp
|
6 years ago |
|
sunyuchao
|
1cfa46ca2e
|
Merge branch 'dev_group_code' into dev_temp
|
6 years ago |
|
sunyuchao
|
b444117e4a
|
二维码下载路径问题
|
6 years ago |
|
zhaoqifeng
|
fb11357bc5
|
徽章最多上线5个
|
6 years ago |
|
zxc
|
29c83bde34
|
Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp
|
6 years ago |
|
zxc
|
1f5afb7bd2
|
徽章修改
|
6 years ago |
|
zhaoqifeng
|
27d6756a1b
|
徽章个数不超过5个
|
6 years ago |
|
wangchao
|
b6bbde9101
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
6 years ago |
|
wangchao
|
b6edd849d6
|
议题重新编辑 新议题标题、建议覆盖原来
|
6 years ago |
|
zxc
|
b518938b76
|
Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp
|
6 years ago |
|
zxc
|
7fd94101a7
|
议题审核历史
|
6 years ago |
|
sunyuchao
|
94cee852ae
|
Merge branch 'dev_personal_center' into dev_temp
|
6 years ago |
|
sunyuchao
|
985f395d5f
|
Merge branch 'dev_wx_msg' into dev_temp
|
6 years ago |
