 王怡栋
|
4e1f22be8a
|
Merge branch 'sprint/212_zhouxudong_59542' into 'master'
Sprint/212 zhouxudong 59542
See merge request easycorp/zentaopms!4321
|
2022-07-04 07:50:04 +00:00 |
|
|
zhouxudong
|
5af55d653b
|
* Finish task #59542 #59541.
|
2022-07-04 07:46:30 +00:00 |
|
|
王怡栋
|
1a82574947
|
Merge branch 'sprint/master_zhouxudong_22964' into 'master'
Sprint/master zhouxudong 22964
See merge request easycorp/zentaopms!4315
|
2022-07-04 06:56:52 +00:00 |
|
|
zhouxudong
|
6b960dc038
|
* Finish task #59542 #59541.
|
2022-07-04 05:57:34 +00:00 |
|
|
zhouxudong
|
c568a46744
|
* Fix bug #22964.
|
2022-07-01 07:20:01 +00:00 |
|
|
王怡栋
|
4b2b0ac214
|
Merge branch 'sprint/208_tianshujie_24393' into 'master'
* Restore code.
See merge request easycorp/zentaopms!4303
|
2022-07-01 05:00:40 +00:00 |
|
|
tianshujie
|
707efd0393
|
* Fix card rendering issues.
|
2022-07-01 09:40:00 +08:00 |
|
|
王怡栋
|
70a58529fe
|
Merge branch 'master_xieqiyu_24227' into 'master'
* Fix bug#24227.
See merge request easycorp/zentaopms!4277
|
2022-06-30 08:35:25 +00:00 |
|
|
xieqiyu
|
f45d133784
|
* Modify title color.
|
2022-06-30 16:26:59 +08:00 |
|
|
xieqiyu
|
28411d109a
|
* Delete title color.
|
2022-06-30 16:19:26 +08:00 |
|
|
孙广明
|
c4d5027b86
|
Merge branch 'fixbug_lang' into 'master'
Fixbug lang
See merge request easycorp/zentaopms!4271
|
2022-06-30 07:10:37 +00:00 |
|
|
sunjun
|
eb1d78fd11
|
fixbug_lang
|
2022-06-30 06:45:58 +00:00 |
|
|
xieqiyu
|
1b338f5cf5
|
* Fix bug#24216.
|
2022-06-30 14:09:52 +08:00 |
|
|
xieqiyu
|
afa1631a35
|
* Code for task#58578. Delete name.
|
2022-06-30 10:09:32 +08:00 |
|
|
leiyong
|
6f4e6390cb
|
* It is judged that the project name cannot be empty.
|
2022-06-29 06:02:23 +00:00 |
|
|
孙广明
|
4dc9c76e9c
|
Merge branch 'sprint209_leiyong_task_58578' into 'master'
* Finish task#58578.
See merge request easycorp/zentaopms!4200
|
2022-06-29 05:34:12 +00:00 |
|
|
hufangzhou
|
cb49804253
|
* Add the new version.
|
2022-06-29 13:18:20 +08:00 |
|
|
tianshujie
|
1e4a9b750b
|
* Restore code.
|
2022-06-29 10:50:38 +08:00 |
|
|
孙广明
|
59eeeced39
|
Merge branch 'sprint210_zg' into 'master'
* Finish task#58772,58774,58775
See merge request easycorp/zentaopms!4184
|
2022-06-29 01:14:39 +00:00 |
|
|
tanghucheng
|
26ae6a991f
|
* Fix bug #23354.
|
2022-06-28 21:33:42 +08:00 |
|
|
leiyong
|
f888f66bf5
|
* Finish task#58578.
|
2022-06-28 09:59:34 +00:00 |
|
|
zenggang
|
15feb917ce
|
* Finish task#58772,58774,58775
|
2022-06-28 05:39:31 +00:00 |
|
|
孙广明
|
14fa8cd30d
|
Merge branch 'master' into 'sprint209_leiyong_task_58579'
# Conflicts:
# module/my/css/task.css
|
2022-06-28 05:05:19 +00:00 |
|
|
leiyong
|
0e0d3be73c
|
* Finish task#58570.
|
2022-06-28 03:21:23 +00:00 |
|
|
zhouxudong
|
be59d6249b
|
* Finish task #58575.
|
2022-06-28 01:25:06 +00:00 |
|
|
zhouxudong
|
6e2b3acd80
|
* Finish task #58575.
|
2022-06-28 01:08:01 +00:00 |
|
|
zhouxudong
|
d8acac2813
|
* Finish task #58575 #58602.
|
2022-06-28 00:49:54 +00:00 |
|
|
zhouxudong
|
6314aad2e3
|
* Finish task #58575 #58602.
|
2022-06-27 08:38:11 +00:00 |
|
|
孙广明
|
66ab8da1b2
|
Merge branch 'leiyong_adjust_feishu' into 'master'
* Fix bug#24192.
See merge request easycorp/zentaopms!4136
|
2022-06-27 02:49:22 +00:00 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
|
leiyong
|
8ab031395a
|
* Adjust CSS.
|
2022-06-24 05:09:15 +00:00 |
|
|
王怡栋
|
f2603f143d
|
Merge branch 'spint/master_zhouxudong_57879' into 'master'
* Finish task #57879.
See merge request easycorp/zentaopms!4125
|
2022-06-24 01:30:35 +00:00 |
|
|
zhouxudong
|
7db6039f4b
|
* Finish task #57879.
|
2022-06-24 00:50:19 +00:00 |
|
|
tianshujie
|
c4bdf0ea3d
|
* Fix bug #23958.
|
2022-06-24 08:42:39 +08:00 |
|
|
王怡栋
|
a4e2413206
|
Merge branch 'sprint205_leiyong_task_57876' into 'master'
* Finish task#57876.
See merge request easycorp/zentaopms!4121
|
2022-06-23 09:28:10 +00:00 |
|
|
leiyong
|
5589e8da54
|
* Adjust CSS.
|
2022-06-23 09:10:44 +00:00 |
|
|
王怡栋
|
ac21bc6527
|
Merge branch 'spint/master_zhouxudong_57879' into 'master'
* Finish task #57879.
See merge request easycorp/zentaopms!4115
|
2022-06-23 08:16:31 +00:00 |
|
|
zhouxudong
|
7fce4137c5
|
* Fix bug #24176.
|
2022-06-23 07:46:34 +00:00 |
|
|
zhouxudong
|
ef1a72a9b1
|
* Finish task #57879.
|
2022-06-23 07:20:52 +00:00 |
|
|
王怡栋
|
f23d4b8abd
|
Merge branch 'sprint/206_tianshujie_58288' into 'master'
Sprint/206 tianshujie 58288
See merge request easycorp/zentaopms!4109
|
2022-06-23 07:08:36 +00:00 |
|
|
tianshujie
|
bf7f947f72
|
* Finish task #58288.
|
2022-06-23 15:05:22 +08:00 |
|
|
孙广明
|
33dd17eb8a
|
Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765
See merge request easycorp/zentaopms!4094
|
2022-06-23 05:30:16 +00:00 |
|
|
leiyong
|
c5eafaeeb6
|
* Finish task#57876.
|
2022-06-23 05:07:28 +00:00 |
|
|
王怡栋
|
77d1ab4daf
|
Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 01:46:35 +00:00 |
|
|
liumengyi
|
c26c9dc110
|
* Optimize code for task #58288.
|
2022-06-23 09:39:29 +08:00 |
|
|
王怡栋
|
4dab93ee3b
|
Merge branch 'sprint/master_zhouxudong_57864' into 'master'
* Finish task #57864.
See merge request easycorp/zentaopms!4082
|
2022-06-23 00:40:27 +00:00 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
xieqiyu
|
2703bc9ba7
|
* Finish task#57875.
|
2022-06-23 08:33:37 +08:00 |
|
|
zhouxudong
|
bc416e40fc
|
* Finish task #57864.
|
2022-06-22 10:11:06 +00:00 |
|
|
mayue
|
6c975adff8
|
* Add some code.
|
2022-06-22 17:21:55 +08:00 |
|