 tianshujie
|
98694da2ae
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-18 16:47:14 +08:00 |
|
|
tianshujie
|
6cb34d72b6
|
* Resolve issue #718.
|
2022-08-18 16:36:27 +08:00 |
|
|
tianshujie
|
88eb976835
|
* Finish task #63687.
|
2022-08-18 16:12:16 +08:00 |
|
|
胡方舟
|
2027a69923
|
Merge branch 'sprint/228' into 'master'
Sprint/228
See merge request easycorp/zentaopms!5015
|
2022-08-18 07:53:30 +00:00 |
|
|
曾刚
|
3172961404
|
Sprint/228 zg tasks and units
|
2022-08-18 07:15:14 +00:00 |
|
|
tianshujie
|
249c5c9cb1
|
* Finish task #64967.
|
2022-08-18 14:53:00 +08:00 |
|
|
王怡栋
|
f3d49ef75f
|
Merge branch 'sprint/max42_mayue_task#64939' into 'master'
Sprint/max42 mayue task#64939
See merge request easycorp/zentaopms!5010
|
2022-08-18 05:54:12 +00:00 |
|
|
tianshujie
|
884d6fa30a
|
* Finish task #64967.
|
2022-08-18 13:44:04 +08:00 |
|
|
李玉春
|
ae0ee026cc
|
Merge branch 'zenops_41' into 'master'
Zenops 41
See merge request easycorp/zentaopms!5013
|
2022-08-18 05:21:42 +00:00 |
|
|
王怡栋
|
c586a24d50
|
Merge branch 'sprint/228_liumengyi_65551' into 'sprint/228'
* Finish task #65551.
See merge request easycorp/zentaopms!5014
|
2022-08-18 05:05:08 +00:00 |
|
|
王怡栋
|
308fb3d2ee
|
Merge branch 'sprint/228_liumengyi_25319' into 'master'
* Fix bug #25319.
See merge request easycorp/zentaopms!4991
|
2022-08-18 05:02:22 +00:00 |
|
|
liumengyi
|
62d465d047
|
* Finish task #65551.
|
2022-08-18 11:22:16 +08:00 |
|
|
tianshujie
|
8287baa6dc
|
* Finish task #63696.
|
2022-08-18 10:45:58 +08:00 |
|
|
tianshujie
|
46071ffaec
|
* Finish task #63696.
|
2022-08-18 10:42:06 +08:00 |
|
|
caoyanyi
|
7b71377d3c
|
Merge branch 'master' into zenops_41
|
2022-08-18 10:37:47 +08:00 |
|
|
liumengyi
|
ce3e1bf617
|
* Finish task #64967.
|
2022-08-18 10:37:17 +08:00 |
|
|
tianshujie
|
9cd4212ef7
|
i* Finish task #63696.
|
2022-08-18 10:23:41 +08:00 |
|
|
tianshujie
|
0ea6aa7b27
|
* Finish task #63696.
|
2022-08-18 10:04:09 +08:00 |
|
|
mayue
|
a48a15cdb1
|
* Ajust codes about stage setType.
|
2022-08-18 09:31:29 +08:00 |
|
|
sunguangming
|
ef679444bd
|
* Code for file checkpriv bug.
|
2022-08-18 08:47:49 +08:00 |
|
|
mayue
|
b3801a92a6
|
* Optimize code.
|
2022-08-18 08:47:31 +08:00 |
|
|
sunguangming
|
b175607c41
|
* Code for file checkpriv bug.
|
2022-08-18 08:25:37 +08:00 |
|
|
liumengyi
|
a998967592
|
* Finish task #65551.
|
2022-08-18 08:21:33 +08:00 |
|
|
liumengyi
|
73253183bc
|
* Finish task #64967.
|
2022-08-17 17:10:10 +08:00 |
|
|
tianshujie
|
df8c9caf46
|
* Finish task #64967.
|
2022-08-17 16:37:02 +08:00 |
|
|
mayue
|
e95ecf9244
|
* Finish task #64939.
|
2022-08-17 16:20:17 +08:00 |
|
|
caoyanyi
|
8c1a24d3b5
|
Merge branch 'master' into zenops_41
|
2022-08-17 16:03:23 +08:00 |
|
|
tianshujie
|
619068ea8d
|
* Finish task #64967.
|
2022-08-17 15:40:01 +08:00 |
|
|
王怡栋
|
fe898f9e20
|
Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687
See merge request easycorp/zentaopms!4985
|
2022-08-17 07:33:25 +00:00 |
|
|
xieqiyu
|
6f6491148a
|
* Fix bug#26414.
|
2022-08-17 15:19:53 +08:00 |
|
|
tianshujie
|
64c7f8dc23
|
* Finish task #63687.
|
2022-08-17 13:15:35 +08:00 |
|
|
liumengyi
|
6dc929d1db
|
* Fix bug #25319.
|
2022-08-17 10:58:25 +08:00 |
|
|
liumengyi
|
33fa12239e
|
* Fix bug #25319.
|
2022-08-17 10:56:09 +08:00 |
|
|
zhouxin
|
607fa5a010
|
* Fix bug of doc-objectLib.
|
2022-08-17 02:16:03 +00:00 |
|
|
tianshujie
|
f9e9d52fdc
|
* Finish task #63687.
|
2022-08-17 09:16:15 +08:00 |
|
|
tianshujie
|
da87f21a39
|
* Finish task #63687.
|
2022-08-16 19:24:24 +08:00 |
|
|
tianshujie
|
24e39026cc
|
* Finish task #64967.
|
2022-08-16 17:07:27 +08:00 |
|
|
王怡栋
|
3256ca241e
|
Merge branch 'master_xieqiyu_26545' into 'master'
* Fix bug#26545.
See merge request easycorp/zentaopms!4983
|
2022-08-16 09:05:54 +00:00 |
|
|
孙广明
|
349686d619
|
Merge branch 'sprint/228_tianshujie_code' into 'sprint/228'
Sprint/228 tianshujie code
See merge request easycorp/zentaopms!4975
|
2022-08-16 08:59:31 +00:00 |
|
|
孙广明
|
1ec773d7d2
|
Merge branch 'sprint/228_tianshujie_fixbug' into 'master'
* Fix bug #26553.
See merge request easycorp/zentaopms!4984
|
2022-08-16 08:56:56 +00:00 |
|
|
tianshujie
|
572b14f05f
|
* Fix bug #26553.
|
2022-08-16 16:46:25 +08:00 |
|
|
tianshujie
|
d5ba096809
|
* Fix bug #26553.
|
2022-08-16 16:44:39 +08:00 |
|
|
xieqiyu
|
7ecf79a163
|
* Fix bug#26545.
|
2022-08-16 16:36:03 +08:00 |
|
|
caoyanyi
|
ef7bcf26eb
|
* Optimize diff page.
|
2022-08-16 15:07:14 +08:00 |
|
|
王怡栋
|
9f7de89251
|
Merge branch 'importExport' into 'master'
* Fix bug #26520,26520.
See merge request easycorp/zentaopms!4979
|
2022-08-16 06:16:21 +00:00 |
|
|
tanghucheng
|
68f35f5262
|
* Fix bug #26520,26520.
|
2022-08-16 13:58:19 +08:00 |
|
|
王怡栋
|
4e2df94bdf
|
Merge branch 'sprint/zentaomax42_lanzongjun' into 'master'
* fix bug cp project
See merge request easycorp/zentaopms!4976
|
2022-08-16 05:07:32 +00:00 |
|
|
lanzongjun
|
572021a1bd
|
* fix params
|
2022-08-16 13:06:58 +08:00 |
|
|
sunguangming
|
3e6052ae5f
|
* Fix bug #26465.
|
2022-08-16 13:02:25 +08:00 |
|
|
lanzongjun
|
4b21f31e5c
|
* fix bug #26462
|
2022-08-16 11:22:57 +08:00 |
|