 tanghucheng
|
5d3b1f4496
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-05 14:59:12 +08:00 |
|
|
王怡栋
|
86693cfb4f
|
Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix sprint211 problems.
See merge request easycorp/zentaopms!4818
|
2022-08-05 06:48:01 +00:00 |
|
|
王怡栋
|
a1518aaf67
|
Merge branch 'master_liuhong_25973' into 'master'
*Fix bug #25973
See merge request easycorp/zentaopms!4823
|
2022-08-05 06:45:43 +00:00 |
|
|
liuhong
|
3f62f19b7f
|
*Fix bug #25973
|
2022-08-05 06:17:05 +00:00 |
|
|
zenggang
|
262ab9e5cd
|
* Fix sprint211 problems.
|
2022-08-05 05:19:47 +00:00 |
|
|
tanghucheng
|
3bfdc7d342
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-05 13:07:31 +08:00 |
|
|
孙广明
|
9f323c631a
|
Merge branch 'lyk_26002_25249' into 'master'
Lyk 26002 25249
See merge request easycorp/zentaopms!4816
|
2022-08-05 03:34:42 +00:00 |
|
|
wangyidong
|
1204fcf8db
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-05 08:46:32 +08:00 |
|
|
wangyidong
|
7796bc8499
|
Merge branch 'sprint/devplat_30'
|
2022-08-05 08:46:26 +08:00 |
|
|
王怡栋
|
7269c3a85e
|
Merge branch 'master_xieqiyu_26019' into 'master'
* Fix bug#26019.
See merge request easycorp/zentaopms!4805
|
2022-08-05 00:40:25 +00:00 |
|
|
xieqiyu
|
f9f47e14cb
|
* Fix bug#26019.
|
2022-08-05 08:32:27 +08:00 |
|
|
liuyongkai
|
7ca2f66a28
|
* Fix bug #26002,25249
|
2022-08-04 10:26:46 +00:00 |
|
|
tanghucheng
|
5f4699ceec
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-04 14:10:36 +08:00 |
|
|
王怡栋
|
14a12f3d8d
|
Merge branch 'master_xieqiyu_26045' into 'master'
* Fix bug#26045.
See merge request easycorp/zentaopms!4788
|
2022-08-04 05:52:57 +00:00 |
|
|
zhouxudong
|
7a34334374
|
* Fix bug.
|
2022-08-04 05:50:24 +00:00 |
|
|
wangyuting2
|
1b2f9f68e6
|
* Adjust assetlib caselib approval menu.
|
2022-08-04 13:47:12 +08:00 |
|
|
xieqiyu
|
d69d68f9bd
|
* Fix bug#26045.
|
2022-08-04 13:34:09 +08:00 |
|
|
王怡栋
|
c80090ff79
|
Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix bug#25998,26017,23426
See merge request easycorp/zentaopms!4783
|
2022-08-04 03:56:58 +00:00 |
|
|
王怡栋
|
a1fc10a300
|
Merge branch 'sprint/222' into 'master'
Sprint/222
See merge request easycorp/zentaopms!4784
|
2022-08-04 03:03:16 +00:00 |
|
|
zhouxudong
|
4ac799f1d5
|
* Update Code.
|
2022-08-04 02:59:02 +00:00 |
|
|
zenggang
|
9314b23885
|
* Fix bug#25998,26017
|
2022-08-04 02:48:29 +00:00 |
|
|
zhouxudong
|
84f3796c88
|
* Finish task #62850.
|
2022-08-04 01:53:21 +00:00 |
|
|
zhouxudong
|
ace4fde7a8
|
* Finish task #62850.
|
2022-08-04 01:48:56 +00:00 |
|
|
zhouxudong
|
461e3275db
|
* Finish task #62850.
|
2022-08-04 01:32:48 +00:00 |
|
|
zhouxudong
|
9f26275965
|
* Finish task #62850.
|
2022-08-04 01:27:07 +00:00 |
|
|
wangyidong
|
d4c95e6e9c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:14:41 +08:00 |
|
|
wangyidong
|
f5b6edef01
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:13:53 +08:00 |
|
|
王怡栋
|
b6869b0602
|
Merge branch 'sgm_block' into 'master'
Sgm block
See merge request easycorp/zentaopms!4772
|
2022-08-04 01:01:35 +00:00 |
|
|
sunguangming
|
9d1ce4c9d5
|
* Code for project export program name.
|
2022-08-04 08:39:15 +08:00 |
|
|
zhouxudong
|
339ccb6a24
|
* Finish task #62850.
|
2022-08-04 00:06:16 +00:00 |
|
|
tanghucheng
|
a8fbdff6ba
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-04 00:03:14 +08:00 |
|
|
zhouxudong
|
545f58f944
|
* Finish task #62850.
|
2022-08-03 09:25:08 +00:00 |
|
|
liuruogu
|
653f238cac
|
* Finish task #63386.
|
2022-08-03 09:05:13 +00:00 |
|
|
wangyuting2
|
afba28db68
|
* Add project execution approval menu.
|
2022-08-03 16:48:10 +08:00 |
|
|
zenggang
|
3a9f4d8ada
|
* Fix bug#25897,22882
|
2022-08-03 07:16:28 +00:00 |
|
|
李玉春
|
e8e657e6bb
|
Update model.php
|
2022-08-03 06:52:05 +00:00 |
|
|
tianshujie
|
b4a394718f
|
* Finish task #62947.
|
2022-08-03 14:49:42 +08:00 |
|
|
tanghucheng
|
1c730049d1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-03 14:11:48 +08:00 |
|
|
tianshujie
|
167c36d6d5
|
* Finish task #62947.
|
2022-08-03 13:41:05 +08:00 |
|
|
wangyuting2
|
84c6278274
|
* Finish task #63288.
|
2022-08-03 13:32:41 +08:00 |
|
|
wangyuting2
|
fa81472771
|
* Adjust menu.
|
2022-08-03 13:32:41 +08:00 |
|
|
zenggang
|
bc8dfbbe7a
|
* Adjust code
|
2022-08-03 01:43:58 +00:00 |
|
|
zhouxudong
|
18504478db
|
* Finish task #62850.
|
2022-08-02 09:39:55 +00:00 |
|
|
zhouxudong
|
73ec96dc8f
|
* Finish task #62850.
|
2022-08-02 09:32:21 +00:00 |
|
|
zhouxudong
|
6a784fdfda
|
* Finish task #62850.
|
2022-08-02 08:50:16 +00:00 |
|
|
zenggang
|
8f6ca19bf7
|
* Finish task#62937,62950
|
2022-08-02 08:19:56 +00:00 |
|
|
zhouxudong
|
2b3121cd21
|
* Finish task #62850.
|
2022-08-02 07:26:14 +00:00 |
|
|
zhouxudong
|
364a5009f4
|
* Finish task #62850.
|
2022-08-02 07:21:03 +00:00 |
|
|
wangyuting2
|
dc14d91320
|
* Finish task #63286.
|
2022-08-02 14:54:20 +08:00 |
|
|
zhouxudong
|
626ab2ccee
|
* Finish task #62836 ~ #62849.
|
2022-08-02 02:41:23 +00:00 |
|