 liumengyi
|
168ebe2b56
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-19 09:08:44 +08:00 |
|
|
wangyidong
|
dffb74c07d
|
* code for task #91381.
|
2023-04-18 17:35:22 +08:00 |
|
|
hufangzhou
|
103cde4dae
|
* Merge code.
|
2023-04-18 15:51:03 +08:00 |
|
|
tianshujie
|
f9f3549e9d
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-04-18 14:18:27 +08:00 |
|
|
tianshujie
|
87f226f407
|
* Modify the document block style.
|
2023-04-18 14:18:14 +08:00 |
|
|
liumengyi
|
b8e8c3d788
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 13:16:42 +08:00 |
|
|
wangyidong
|
0d31625643
|
* code for task #91388.
|
2023-04-18 13:05:14 +08:00 |
|
|
liumengyi
|
17ee6ad3f4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 11:06:01 +08:00 |
|
|
tianshujie
|
59afadec4a
|
* Code for task #91389,91390.
|
2023-04-18 09:03:43 +08:00 |
|
|
liumengyi
|
d971d4b4b7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 08:38:14 +08:00 |
|
|
tianshujie
|
4c595d88d7
|
* Delete useless variables.
|
2023-04-18 08:37:10 +08:00 |
|
|
wangyidong
|
5399ec46be
|
* code for task #91381.
|
2023-04-17 17:14:56 +08:00 |
|
|
hufangzhou
|
0e8f7d807c
|
Merge branch 'master' into zentaopms_304
|
2023-04-17 08:30:02 +08:00 |
|
|
tianshujie
|
beffe82709
|
* Code for task #43816.
|
2023-04-14 16:11:06 +08:00 |
|
|
tianshujie
|
2c1fb2826b
|
* Code for story #43815.
|
2023-04-14 15:31:41 +08:00 |
|
|
liumengyi
|
648dc288ca
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-14 15:15:03 +08:00 |
|
|
guofeilong
|
938bb13c6c
|
* Adjust code in doc block .
|
2023-04-14 10:04:44 +08:00 |
|
|
guofeilong
|
60499b8226
|
* Adjust code for css in doc/index .
|
2023-04-13 16:56:28 +08:00 |
|
|
caoyanyi
|
7fca60ca3a
|
* Modify doc icon size.
|
2023-04-13 13:01:31 +08:00 |
|
|
liumengyi
|
df1a0f283d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-13 08:39:57 +08:00 |
|
|
tianshujie
|
e452930e02
|
* Code for task #90781.
|
2023-04-13 08:38:31 +08:00 |
|
|
tianshujie
|
aec7381fcf
|
* Code for task #90782.
|
2023-04-12 16:46:53 +08:00 |
|
|
liumengyi
|
ca9c565982
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-12 16:39:44 +08:00 |
|
|
tianshujie
|
5444be8677
|
* Code for task #90782.
|
2023-04-12 15:08:32 +08:00 |
|
|
tianshujie
|
2a71bcf16b
|
* Code for task #90782.
|
2023-04-12 14:43:47 +08:00 |
|
|
tianshujie
|
c7c7e55d0c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 14:32:47 +08:00 |
|
|
caoyanyi
|
875aee00b1
|
* Modify doc priv style.
|
2023-04-12 14:31:37 +08:00 |
|
|
tianshujie
|
9a4c5d2ac8
|
* Code for task #90782.
|
2023-04-12 13:15:55 +08:00 |
|
|
caoyanyi
|
493e4a8589
|
* Modify no data tips.
|
2023-04-12 11:10:01 +08:00 |
|
|
caoyanyi
|
26b79296d4
|
* Code for bug #34013, task #90781.
|
2023-04-12 10:38:22 +08:00 |
|
|
caoyanyi
|
021dbcc7eb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-12 10:10:59 +08:00 |
|
|
caoyanyi
|
c6cf7c6f35
|
* Code for task #90781.
|
2023-04-12 10:10:29 +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 |
|
|
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 |
|
|
liumengyi
|
e3c6375224
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-12 08:58:39 +08:00 |
|
|
tianshujie
|
1d2a069f12
|
* Rename block.
|
2023-04-12 08:44:40 +08: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
|
675f25a191
|
* Modify style for right block.
|
2023-04-11 16:47:45 +08:00 |
|
|
tianshujie
|
81e7153c8e
|
* Code for task #90780.
|
2023-04-11 16:34:29 +08:00 |
|
|
caoyanyi
|
185550fcf4
|
* Code for task #90779.
|
2023-04-11 16:11:55 +08:00 |
|
|
tianshujie
|
1f026f246a
|
* Code for task #90780.
|
2023-04-11 15:38:44 +08:00 |
|
|
liumengyi
|
2397c644f5
|
* Finish task #91011.
|
2023-04-11 15:30:05 +08:00 |
|
|
tianshujie
|
66d0694599
|
* Code for task #90778.
|
2023-04-10 17:15:26 +08:00 |
|
|
caoyanyi
|
8e3935c8d7
|
* Modify font color.
|
2023-03-16 14:11:11 +08:00 |
|
|
caoyanyi
|
61b782d0d3
|
* Adjust code.
|
2023-03-13 15:27:14 +08:00 |
|
|
guofeilong
|
7375d26d90
|
* Code for bug #32714 .
|
2023-03-13 14:18:55 +08:00 |
|
|
caoyanyi
|
7d40afc496
|
* Fix bug 29433.
|
2023-03-10 10:16:07 +08:00 |
|
|
王怡栋
|
3438722a8c
|
Merge branch 'master' into 'zentaopms_289'
# Conflicts:
# db/update18.2.sql
|
2023-03-06 03:26:34 +00:00 |
|
|
Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08:00 |
|