 tanghucheng
|
d0694aae7e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-20 16:02:00 +08:00 |
|
|
王怡栋
|
f4fb9ca204
|
Merge branch 'sprint/217_liumengyi_61173' into 'master'
* Finish task #61173.
See merge request easycorp/zentaopms!4609
|
2022-07-20 08:01:12 +00:00 |
|
|
liumengyi
|
9ed05fad25
|
* Optimize code for task #61173.
|
2022-07-20 15:59:50 +08:00 |
|
|
liumengyi
|
d161817441
|
* Optimize code for task #61173.
|
2022-07-20 15:56:59 +08:00 |
|
|
王怡栋
|
e9ed908608
|
Merge branch 'cyy_mr_create' into 'master'
* Modify protect branch tips.
See merge request easycorp/zentaopms!4607
|
2022-07-20 06:59:07 +00:00 |
|
|
caoyanyi
|
dcf20546ca
|
* Adjust codes.
|
2022-07-20 14:28:07 +08:00 |
|
|
王怡栋
|
d3c3973346
|
Merge branch 'sprint/hufangzhou_doc' into 'master'
* Finish task #59750.
See merge request easycorp/zentaopms!4608
|
2022-07-20 06:27:44 +00:00 |
|
|
hufangzhou
|
9e54c0b55c
|
* Change the if statement to toggleClass.
|
2022-07-20 14:27:08 +08:00 |
|
|
王怡栋
|
d349931e82
|
Merge branch 'sprint/217_liumengyi_61171' into 'master'
* Finish task #61171, #61170.
See merge request easycorp/zentaopms!4610
|
2022-07-20 06:23:40 +00:00 |
|
|
hufangzhou
|
fab8fedf10
|
* Adjust the judgment condition to a configuration item.
|
2022-07-20 14:15:43 +08:00 |
|
|
liumengyi
|
45eb1e2f99
|
* Fix bug for task #61171.
|
2022-07-20 13:54:23 +08:00 |
|
|
孙广明
|
e8cedee6bb
|
* Code for code error.
|
2022-07-20 13:49:10 +08:00 |
|
|
孙广明
|
c5529b23ee
|
* Fix bug #25494.
|
2022-07-20 13:44:49 +08:00 |
|
|
caoyanyi
|
fc8be7e037
|
* Modify lang error.
|
2022-07-20 13:35:49 +08:00 |
|
|
hufangzhou
|
1085813b49
|
* Adjust the tips of required fields.
|
2022-07-20 13:33:52 +08:00 |
|
|
liumengyi
|
ecada98f89
|
* Fix bug for task #61171.
|
2022-07-20 13:15:34 +08:00 |
|
|
caoyanyi
|
f8a5428709
|
* Modify protect branch tips.
|
2022-07-20 12:07:32 +08:00 |
|
|
王怡栋
|
972994bfa0
|
Merge branch 'cyy_mr' into 'master'
* Modify delete branch after merge.
See merge request easycorp/zentaopms!4605
|
2022-07-20 03:23:02 +00:00 |
|
|
wangyidong
|
bbb79d5f94
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-20 10:59:50 +08:00 |
|
|
wangyidong
|
7542c26998
|
* code for task #61483.
|
2022-07-20 10:58:57 +08:00 |
|
|
liumengyi
|
13eda1d631
|
* Finish task #61173.
|
2022-07-20 10:28:01 +08:00 |
|
|
hufangzhou
|
d7c33d2859
|
* Adjust the height of basic info box.
|
2022-07-20 10:27:37 +08:00 |
|
|
hufangzhou
|
1dcf2dcb2c
|
* Code for task #59750.
|
2022-07-20 10:13:21 +08:00 |
|
|
caoyanyi
|
809f321445
|
* Modify delete branch after merge.
|
2022-07-20 09:59:14 +08:00 |
|
|
王怡栋
|
70f12a35da
|
Merge branch 'sprint/217_tianshujie_code' into 'master'
* Finish task #61177.
See merge request easycorp/zentaopms!4604
|
2022-07-20 01:46:08 +00:00 |
|
|
王怡栋
|
895f8136ec
|
Merge branch 'cyy_mr' into 'master'
* Modify mr review log.
See merge request easycorp/zentaopms!4602
|
2022-07-20 01:45:46 +00:00 |
|
|
王怡栋
|
c904507658
|
Merge branch 'sprint/master_zhouxudong_61110' into 'master'
* Finish task #61110.
See merge request easycorp/zentaopms!4603
|
2022-07-20 01:45:32 +00:00 |
|
|
tianshujie
|
d225cab26b
|
* Remove spaces.
|
2022-07-20 09:45:12 +08:00 |
|
|
tianshujie
|
72ac19d156
|
* Finish task #61177.
|
2022-07-20 09:42:37 +08:00 |
|
|
孙广明
|
9f1847d55b
|
* Code for code error.
|
2022-07-20 09:35:30 +08:00 |
|
|
zhouxudong
|
6884f83b21
|
* Finish task #61110.
|
2022-07-20 01:31:31 +00:00 |
|
|
caoyanyi
|
3de9a41c2b
|
* Modify mr review log.
|
2022-07-20 09:25:43 +08:00 |
|
|
王怡栋
|
1e14279144
|
Merge branch 'cyy_mr' into 'master'
Cyy mr
See merge request easycorp/zentaopms!4601
|
2022-07-20 01:16:22 +00:00 |
|
|
王怡栋
|
80c3b67ee1
|
Merge branch 'sprint/tianshujie_code' into 'master'
Sprint/tianshujie code
See merge request easycorp/zentaopms!4600
|
2022-07-20 01:15:46 +00:00 |
|
|
caoyanyi
|
1b6f3e6a23
|
* Adjust codes.
|
2022-07-20 09:06:31 +08:00 |
|
|
tianshujie
|
e19b245d2a
|
* Finish task #61177.
|
2022-07-20 08:56:53 +08:00 |
|
|
tianshujie
|
248ea09a59
|
* Fix bug #25450.
|
2022-07-20 08:51:50 +08:00 |
|
|
tianshujie
|
53e12e967c
|
* Finish task #61181.
|
2022-07-20 08:48:51 +08:00 |
|
|
王怡栋
|
c3cd219d3c
|
Merge branch 'sprint/217_liumengyi_25457' into 'master'
* Fix bug #25457.
See merge request easycorp/zentaopms!4599
|
2022-07-20 00:48:07 +00:00 |
|
|
liumengyi
|
5b4bc9ab8f
|
* Fix bug #25457.
|
2022-07-20 08:40:30 +08:00 |
|
|
tianshujie
|
f0dec448ce
|
* Finish task #61177.
|
2022-07-20 08:36:04 +08:00 |
|
|
王怡栋
|
9abacbd0c9
|
Merge branch 'sprint/master_zhouxudong_61110' into 'master'
Sprint/master zhouxudong 61110
See merge request easycorp/zentaopms!4598
|
2022-07-20 00:29:16 +00:00 |
|
|
王怡栋
|
3120ef2aa2
|
Merge branch 'zenops_38' into 'master'
Zenops 38
See merge request easycorp/zentaopms!4597
|
2022-07-20 00:28:11 +00:00 |
|
|
tanghucheng
|
18e857217f
|
* Code for port.
|
2022-07-19 17:25:30 +08:00 |
|
|
tanghucheng
|
d0d06e81b0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-19 17:25:19 +08:00 |
|
|
caoyanyi
|
07465a327d
|
* Modify merge request view.
|
2022-07-19 17:04:12 +08:00 |
|
|
tianshujie
|
35537ff9db
|
* Fix bug #25453.
|
2022-07-19 16:33:03 +08:00 |
|
|
wangyidong
|
4601a6966d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-19 15:36:20 +08:00 |
|
|
wangyidong
|
fbbbd58cbc
|
* code for task #61200.
|
2022-07-19 15:36:03 +08:00 |
|
|
王怡栋
|
96d0f549da
|
Merge branch 'sprint/217_liumengyi_61174' into 'master'
* Finish task #61174.
See merge request easycorp/zentaopms!4595
|
2022-07-19 07:33:30 +00:00 |
|