 王怡栋
|
0fa6aff4f4
|
Merge branch 'dev/gfl_task' into 'master'
* Adjust code for fix icon-name error .
See merge request easycorp/zentaopms!7376
|
2023-04-12 02:00:46 +00:00 |
|
|
guofeilong
|
15392a7c8e
|
* Adjust code for fix icon-name error .
|
2023-04-12 09:57:00 +08:00 |
|
|
王怡栋
|
78a9facdb3
|
Merge branch 'tsj_task' into 'master'
* Code f or dynamic
See merge request easycorp/zentaopms!7374
|
2023-04-12 01:55:43 +00:00 |
|
|
王怡栋
|
a935083183
|
Merge branch 'zentaobiz38_bi_wangyuting' into 'master'
* Finish task #90970.
See merge request easycorp/zentaopms!7373
|
2023-04-12 01:54:51 +00:00 |
|
|
王怡栋
|
4fe94c261f
|
Merge branch 'cyy_90779' into 'master'
Cyy 90779
See merge request easycorp/zentaopms!7371
|
2023-04-12 01:54:21 +00:00 |
|
|
王怡栋
|
c7c6fb024a
|
Merge branch 'dev/gfl_addIcon' into 'master'
* ZUI: files refactors for add icons .
See merge request easycorp/zentaopms!7375
|
2023-04-12 01:53:46 +00:00 |
|
|
guofeilong
|
4c44c7c722
|
* ZUI: files refactors for add icons .
|
2023-04-12 09:51:25 +08:00 |
|
|
朱金勇
|
8050bee793
|
* Fix data type of dmdb.
|
2023-04-12 01:49:08 +00:00 |
|
|
caoyanyi
|
72714d554d
|
* Modify language.
|
2023-04-12 09:32:15 +08:00 |
|
|
tianshujie
|
ab05c059eb
|
* Code for task #90780.
|
2023-04-12 09:28:15 +08:00 |
|
|
tianshujie
|
324dfe4650
|
* Code for task #90780.
|
2023-04-12 09:08:51 +08:00 |
|
|
caoyanyi
|
4e888b8f3d
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-12 09:00:04 +08:00 |
|
|
wangyidong
|
c4998656f4
|
* fix bug #34018.
|
2023-04-12 08:54:03 +08:00 |
|
|
caoyanyi
|
b615fbc681
|
* Code for bug #34038.
|
2023-04-12 08:47:44 +08:00 |
|
|
tianshujie
|
1d2a069f12
|
* Rename block.
|
2023-04-12 08:44:40 +08:00 |
|
|
wangyidong
|
36910d7cb4
|
* fix bug #34030.
|
2023-04-12 08:44:11 +08:00 |
|
|
wangyuting2
|
6c8b63e7c7
|
* Finish task #90970.
|
2023-04-11 17:28:06 +08:00 |
|
|
wangyuting2
|
d59002cc69
|
* Finish task #90970.
|
2023-04-11 17:26:48 +08:00 |
|
|
wangyuting2
|
b84c39e0c4
|
* Finish task #90970.
|
2023-04-11 17:25:31 +08:00 |
|
|
liugang
|
8eea52f597
|
* Change the default privileges from report to pivot.
|
2023-04-11 09:21:50 +00:00 |
|
|
caoyanyi
|
f194177369
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-11 17:13:05 +08:00 |
|
|
caoyanyi
|
c78ed61098
|
* Modify action btn style.
|
2023-04-11 16:58:00 +08:00 |
|
|
wangyidong
|
599a06266c
|
* code for task #90775.
|
2023-04-11 16:49:51 +08:00 |
|
|
caoyanyi
|
675f25a191
|
* Modify style for right block.
|
2023-04-11 16:47:45 +08:00 |
|
|
王怡栋
|
432f029a2f
|
Merge branch 'dev/gfl_task' into 'master'
* Code for task #89913 .
See merge request easycorp/zentaopms!7370
|
2023-04-11 08:47:14 +00:00 |
|
|
wangyidong
|
995f111530
|
Merge branch 'tsj_dynamic'
|
2023-04-11 16:46:45 +08:00 |
|
|
王怡栋
|
a0868cb0ff
|
Merge branch 'master' into 'tsj_dynamic'
# Conflicts:
# module/doc/model.php
|
2023-04-11 08:46:26 +00:00 |
|
|
王怡栋
|
7ec955380e
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7364
|
2023-04-11 08:45:18 +00:00 |
|
|
wangyidong
|
594364c4e0
|
* code for task #90775.
|
2023-04-11 16:44:09 +08:00 |
|
|
guofeilong
|
661e26fb97
|
* Code for task #89913 .
|
2023-04-11 16:43:22 +08:00 |
|
|
刘刚
|
719f0a8349
|
Merge branch 'screen_filter' into 'master'
* update go-view dist.
See merge request easycorp/zentaopms!7368
|
2023-04-11 08:41:29 +00:00 |
|
|
tianshujie
|
81e7153c8e
|
* Code for task #90780.
|
2023-04-11 16:34:29 +08:00 |
|
|
qixinzhi
|
f90a309274
|
* update go-view dist.
|
2023-04-11 16:27:05 +08:00 |
|
|
刘刚
|
18a4158daa
|
Merge branch 'sprint/scx_createdefault_dimension' into 'master'
* Modify task #90919.
See merge request easycorp/zentaopms!7367
|
2023-04-11 08:21:48 +00:00 |
|
|
刘刚
|
c59451dc91
|
Merge branch 'master_xieqiyu_33846' into 'master'
* Code for bug#33846.
See merge request easycorp/zentaopms!7365
|
2023-04-11 08:21:27 +00:00 |
|
|
宋辰轩
|
5ad72bdcf9
|
* Modify task #90919.
|
2023-04-11 16:18:26 +08:00 |
|
|
王怡栋
|
a6fe1de7e4
|
Merge branch 'dev/gfl_task' into 'master'
* Code for add logic to show outlineMenu .
See merge request easycorp/zentaopms!7366
|
2023-04-11 08:16:22 +00:00 |
|
|
caoyanyi
|
185550fcf4
|
* Code for task #90779.
|
2023-04-11 16:11:55 +08:00 |
|
|
guofeilong
|
3ff45d64ef
|
* Code for add logic to show outlineMenu .
|
2023-04-11 16:09:50 +08:00 |
|
|
xieqiyu
|
e8123d02ec
|
* Code for bug#33846.
|
2023-04-11 07:55:34 +00:00 |
|
|
tianshujie
|
55a5e45601
|
* Fix bug #34040.
|
2023-04-11 15:44:09 +08:00 |
|
|
tianshujie
|
1f026f246a
|
* Code for task #90780.
|
2023-04-11 15:38:44 +08:00 |
|
|
王怡栋
|
ac9837abcb
|
Merge branch 'daitingting_process_filterAndGroup' into 'master'
* Process filter of chart.
See merge request easycorp/zentaopms!7362
|
2023-04-11 07:13:31 +00:00 |
|
|
王怡栋
|
70b496a23b
|
Merge branch 'dev/gfl_task' into 'master'
* Code for bug print view while bread more than two .
See merge request easycorp/zentaopms!7363
|
2023-04-11 07:12:41 +00:00 |
|
|
guofeilong
|
c0be59e7e3
|
* Code for bug print view while bread more than two .
|
2023-04-11 15:10:31 +08:00 |
|
|
wangyidong
|
8f519b0bde
|
* code for task #90783.
|
2023-04-11 15:04:08 +08:00 |
|
|
daitingting
|
ee8f7b50f9
|
* Process filter of chart.
* Process group of report.
|
2023-04-11 14:59:11 +08:00 |
|
|
王怡栋
|
ebe7eb7217
|
Merge branch 'dev/gfl_task#90776' into 'master'
Dev/gfl task#90776
See merge request easycorp/zentaopms!7360
|
2023-04-11 06:44:46 +00:00 |
|
|
wangyidong
|
9bba7c624d
|
* code for task #90783.
|
2023-04-11 14:44:09 +08:00 |
|
|
guofeilong
|
804ebdd5d3
|
* Code for adjust style in tree .
|
2023-04-11 14:39:53 +08:00 |
|