 liumengyi
|
9fadd45264
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-11 14:19:00 +08:00 |
|
|
王怡栋
|
b1b4e4cb43
|
Merge branch 'tsj_search' into 'master'
* Code for task #89911.
See merge request easycorp/zentaopms!7358
|
2023-04-11 06:06:54 +00:00 |
|
|
王怡栋
|
857b57b6eb
|
Merge branch 'cyy_task' into 'master'
Cyy task
See merge request easycorp/zentaopms!7355
|
2023-04-11 06:05:51 +00:00 |
|
|
王怡栋
|
ba3d0c7647
|
Merge branch 'dev/gfl_task#90776' into 'master'
Dev/gfl task#90776
See merge request easycorp/zentaopms!7359
|
2023-04-11 06:05:10 +00:00 |
|
|
guofeilong
|
f175fa66e1
|
* Adjust code for task #90834 .
|
2023-04-11 14:03:34 +08:00 |
|
|
guofeilong
|
08614f32d1
|
* Code for task #90834 .
|
2023-04-11 13:59:22 +08:00 |
|
|
liumengyi
|
d6887ed43d
|
* Finish task #91013.
|
2023-04-11 13:43:14 +08:00 |
|
|
tianshujie
|
9401d27a5c
|
* Code for task #89911.
|
2023-04-11 13:39:58 +08:00 |
|
|
朱金勇
|
58f458f6d0
|
* Fix bugs of program action.
|
2023-04-11 05:28:42 +00:00 |
|
|
liumengyi
|
ae41429613
|
* Fix bug of manage priv by group.
|
2023-04-11 13:16:28 +08:00 |
|
|
liumengyi
|
3ab4c92443
|
* Fix bug of task #89841.
|
2023-04-11 11:33:51 +08:00 |
|
|
刘刚
|
e09c353162
|
Merge branch 'chart_filter_format' into 'master'
* Add chart filter format.
See merge request easycorp/zentaopms!7357
|
2023-04-11 03:24:08 +00:00 |
|
|
liumengyi
|
3978dd46a6
|
* Fix bug of task #89846.
|
2023-04-11 11:24:06 +08:00 |
|
|
liumengyi
|
73cd82e2bc
|
* Fix bug of task #89846.
|
2023-04-11 11:21:29 +08:00 |
|
|
wangyidong
|
73ed3946e2
|
* code for task #90784.
|
2023-04-11 11:19:22 +08:00 |
|
|
刘刚
|
3ce431f253
|
Merge branch 'screen_filter' into 'master'
* Update go-view dist.
See merge request easycorp/zentaopms!7356
|
2023-04-11 03:09:18 +00:00 |
|
|
刘刚
|
a549b0c690
|
Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Finish task #90968.
See merge request easycorp/zentaopms!7354
|
2023-04-11 03:09:03 +00:00 |
|
|
朱金勇
|
d20df48faf
|
* Fix primary key of dmdb.
|
2023-04-11 03:05:50 +00:00 |
|
|
liumengyi
|
1fb0227c0d
|
* Finish task #89842.
|
2023-04-11 11:02:35 +08:00 |
|
|
hufangzhou
|
ec6e9f2f11
|
* Change the unassigned to other.
|
2023-04-11 10:56:16 +08:00 |
|
|
qixinzhi
|
43fe2bc451
|
* Update go-view dist.
|
2023-04-11 10:07:40 +08:00 |
|
|
caoyanyi
|
5e5eb3396a
|
* Code for task #90790.
|
2023-04-11 09:59:22 +08:00 |
|
|
liumengyi
|
7a63b3f6d8
|
* Fix bug of show relation privs.
|
2023-04-11 09:59:20 +08:00 |
|
|
caoyanyi
|
64d0ac3c6a
|
* Code for task #89912.
|
2023-04-11 09:54:32 +08:00 |
|
|
wangyidong
|
0a45b89acd
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-11 09:43:39 +08:00 |
|
|
wangyidong
|
f37eea5af8
|
* fix error.
|
2023-04-11 09:43:24 +08:00 |
|
|
wangyuting2
|
2285fefd83
|
* Finish task #90968.
|
2023-04-11 09:38:51 +08:00 |
|
|
王怡栋
|
26ce424cf0
|
Merge branch 'tsj_fixbug' into 'master'
* Remove useless code.
See merge request easycorp/zentaopms!7352
|
2023-04-11 01:31:30 +00:00 |
|
|
王怡栋
|
e6d61c4d01
|
Merge branch 'dev/gfl_task#90776' into 'master'
* Code for add moduleID in func view .
See merge request easycorp/zentaopms!7353
|
2023-04-11 01:30:49 +00:00 |
|
|
guofeilong
|
5763b6314b
|
* Code for add moduleID in func view .
|
2023-04-11 09:26:41 +08:00 |
|
|
王怡栋
|
9f88617730
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7349
|
2023-04-11 01:19:32 +00:00 |
|
|
tianshujie
|
95998c1f2a
|
* Remove useless code.
|
2023-04-11 09:19:11 +08:00 |
|
|
wangyidong
|
4926b80ad0
|
Merge branch 'release/zentaopms_18.3'
|
2023-04-11 09:18:40 +08:00 |
|
|
王怡栋
|
18dc5f2d59
|
Merge branch 'master' into 'release/zentaopms_18.3'
# Conflicts:
# module/doc/control.php
# module/doc/css/view.css
# module/doc/js/view.js
|
2023-04-11 01:17:43 +00:00 |
|
|
guofeilong
|
9505ba7e47
|
* Adjust code for fix bug .
|
2023-04-11 09:10:35 +08:00 |
|
|
guofeilong
|
298dd970d2
|
* Code for css refactors in tableContents .
|
2023-04-11 09:02:28 +08:00 |
|
|
tianshujie
|
85b9981ed4
|
* Compatible with lite page.
|
2023-04-11 08:59:30 +08:00 |
|
|
刘刚
|
4074f344eb
|
Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Finish task #90925.
See merge request easycorp/zentaopms!7350
|
2023-04-11 00:57:30 +00:00 |
|
|
wangyidong
|
b3d37057b6
|
* code for task #90793.
|
2023-04-11 08:56:03 +08:00 |
|
|
wangyuting2
|
f77c67694c
|
* Finish task #90925.
|
2023-04-11 08:54:30 +08:00 |
|
|
tianshujie
|
1ce64ff3c9
|
* Fix bug #33985.
|
2023-04-11 08:47:05 +08:00 |
|
|
王怡栋
|
bc3daacc3c
|
Merge branch 'tsj_block' into 'master'
* Code for task #90778.
See merge request easycorp/zentaopms!7348
|
2023-04-11 00:36:04 +00:00 |
|
|
王怡栋
|
f1bf266118
|
Merge branch 'sprint/cyy_90971' into 'master'
* Code for task #90971.
See merge request easycorp/zentaopms!7345
|
2023-04-11 00:35:44 +00:00 |
|
|
王怡栋
|
f1bc3b73cc
|
Merge branch 'tsj_doc' into 'master'
* Code for task #90792.
See merge request easycorp/zentaopms!7343
|
2023-04-11 00:35:16 +00:00 |
|
|
hufangzhou
|
214e7b427e
|
* Code for task #89843.
|
2023-04-11 08:22:21 +08:00 |
|
|
朱金勇
|
b3b75c2fb9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-10 13:43:33 +00:00 |
|
|
朱金勇
|
eaf7d976c1
|
* Fix sql function: count(if(...)).
|
2023-04-10 13:42:45 +00:00 |
|
|
wangyidong
|
1a32c02940
|
* fix bug #33914.
|
2023-04-10 17:36:53 +08:00 |
|
|
caoyanyi
|
57a90fc348
|
* Code for bug #33943.
|
2023-04-10 17:29:22 +08:00 |
|
|
刘刚
|
feefb5d24c
|
Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Finish task #90972.
See merge request easycorp/zentaopms!7347
|
2023-04-10 09:29:10 +00:00 |
|