jianjun
|
2aca93fc1d
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
jianjun
|
869ac57933
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_difficulty_data
|
5 years ago |
wxz
|
633a152671
|
修改错误
|
5 years ago |
sunyuchao
|
914d5b31fd
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
liushaowen
|
eeb104a147
|
微信订阅AccessToken获取bug修复
|
5 years ago |
|
sunyuchao
|
d98362be96
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
liushaowen
|
95d0b37439
|
更新插入记录表的方式
|
5 years ago |
|
sunyuchao
|
35144233b1
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
a4bc8c0544
|
Merge remote-tracking branch 'origin/dev_wx_msg' into dev_wx_msg
|
5 years ago |
|
sunyuchao
|
6666e43933
|
添加日志
|
5 years ago |
|
jianjun
|
02a634e20e
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev
|
5 years ago |
|
jianjun
|
1c84c9ed49
|
Merge remote-tracking branch 'remotes/origin/dev_common' into dev_temp
|
5 years ago |
|
jianjun
|
e0e61800c8
|
添加客户端Ip
|
5 years ago |
|
wxz
|
781dae5c92
|
Merge branch 'dev_footbar_cache' into dev
|
5 years ago |
|
wxz
|
3f08c4e1fa
|
Merge branch 'dev' into dev_footbar_cache
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
|
wxz
|
ef6091b4fd
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
wxz
|
eeede2dee0
|
修复：居民端用户订阅次数，忘了insert
|
5 years ago |
|
jianjun
|
e97d36d9f7
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
75a87e21f7
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
|
5 years ago |
|
jianjun
|
fef3d60418
|
无参构造函数
|
5 years ago |
zxc
|
baf67f1fa6
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
52ca934a7d
|
Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev
|
5 years ago |
|
zxc
|
4208adc393
|
党支部新接口添加
|
5 years ago |
zhaoqifeng
|
cbda379962
|
代码模板管理
|
5 years ago |
|
zxc
|
41efaa3b8d
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
fbffc6be9c
|
党支部新接口添加
|
5 years ago |
|
zxc
|
b75b161608
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
0b62e94359
|
党支部新接口添加
|
5 years ago |
wangchao
|
cf1eed1de2
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wxz
|
0195e7ec54
|
调整内外部认证，支持同时使用内外部认证
|
5 years ago |
|
wangchao
|
3113a24cd9
|
project_staff关联project_process条件调整
|
5 years ago |
|
zxc
|
bcf937dd2a
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
2176fa35e4
|
党支部新接口添加
|
5 years ago |
|
sunyuchao
|
c3d509e5a2
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
1a915f33bb
|
入参参数校验
|
5 years ago |
|
sunyuchao
|
7d1068ff28
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
0a405fd701
|
返参DTO调整
|
5 years ago |
|
sunyuchao
|
46630de7be
|
代码调整
|
5 years ago |
|
sunyuchao
|
124fd90aae
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
87e37842d8
|
代码调整
|
5 years ago |
|
zxc
|
65ecee7964
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
ccd91e28ea
|
党支部新接口添加
|
5 years ago |
|
zxc
|
0dad1e23ac
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
2822de7c57
|
党支部新接口添加
|
5 years ago |
|
jianjun
|
01b9373440
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix
|
5 years ago |
|
wangchao
|
ed6963f45d
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
4d66292a4b
|
在项目节点耗时补全数据时，project_staff与project_process的弱关联时间误差改小到五秒以内并加上orgId、gridId、departmentId的匹配。注:因为project_staff表关联到project_process是流转给当前staff的节点，这个staff处理之后生成的节点没有关联上所以只能弱关联。
|
5 years ago |
|
sunyuchao
|
5632160957
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
|
sunyuchao
|
9e42f11374
|
漏提代码
|
5 years ago |
|
sunyuchao
|
5bfd3f0f7d
|
Merge branch 'dev_wx_msg' into dev_temp
|
5 years ago |
