 王怡栋
|
9734ebdb4e
|
Merge branch 'master_xieqiyu_24304' into 'master'
* Fix bug#24304.
See merge request easycorp/zentaopms!4164
|
2022-06-28 01:18:58 +00:00 |
|
|
zhouxudong
|
6e2b3acd80
|
* Finish task #58575.
|
2022-06-28 01:08:01 +00:00 |
|
|
tianshujie
|
319d29e3d3
|
* Finish task #58552.
|
2022-06-28 09:06:38 +08:00 |
|
|
王怡栋
|
2a82c6a6a1
|
Merge branch 'sprint/master_zhouxudong_58576' into 'master'
Sprint/master zhouxudong 58576
See merge request easycorp/zentaopms!4163
|
2022-06-28 01:05:10 +00:00 |
|
|
xieqiyu
|
ff2a952493
|
* Fix bug#24304.
|
2022-06-28 09:03:40 +08:00 |
|
|
zhouxudong
|
72200617d3
|
* Finish task #58576.
|
2022-06-28 00:57:01 +00:00 |
|
|
zhouxudong
|
d8acac2813
|
* Finish task #58575 #58602.
|
2022-06-28 00:49:54 +00:00 |
|
|
王怡栋
|
d84d8cac4a
|
Merge branch 'master_xieqiyu_58585' into 'master'
* Finish task#58585.
See merge request easycorp/zentaopms!4159
|
2022-06-28 00:26:01 +00:00 |
|
|
王怡栋
|
4f90ce5f08
|
Merge branch 'sprint/206_tianshujie_23955' into 'master'
Sprint/206 tianshujie 23955
See merge request easycorp/zentaopms!4148
|
2022-06-28 00:24:31 +00:00 |
|
|
孙广明
|
da315c7aaf
|
* Fix product order bug.
|
2022-06-28 08:15:51 +08:00 |
|
|
xieqiyu
|
f7b01e1a0e
|
* Finish task#58585.
|
2022-06-28 08:14:06 +08:00 |
|
|
leiyong
|
808d67b879
|
* Adjust code.
|
2022-06-27 10:32:20 +00:00 |
|
|
孙广明
|
fbf36ea3e6
|
Merge branch 'master_xieqiyu_57854' into 'master'
* Modify language item.
See merge request easycorp/zentaopms!4158
|
2022-06-27 09:32:04 +00:00 |
|
|
孙广明
|
3bfc3a9f31
|
Merge branch 'sprint/209_hufangzhou_58563' into 'master'
* Finish task #58563.
See merge request easycorp/zentaopms!4153
|
2022-06-27 09:31:53 +00:00 |
|
|
xieqiyu
|
132433cc92
|
* Modify language item.
|
2022-06-27 17:27:15 +08:00 |
|
|
tianshujie
|
70b01098ac
|
* Finish task #58552.
|
2022-06-27 17:22:49 +08:00 |
|
|
孙广明
|
209b13aafb
|
Merge branch 'fixbug' into 'master'
* Fix bug #24340.
See merge request easycorp/zentaopms!4154
|
2022-06-27 09:20:50 +00:00 |
|
|
孙广明
|
53ce8a4560
|
Merge branch 'master_xieqiyu_57854' into 'master'
Master xieqiyu 57854
See merge request easycorp/zentaopms!4157
|
2022-06-27 09:19:58 +00:00 |
|
|
孙广明
|
342214a5ad
|
Merge branch 'master_xieqiyu_58591' into 'master'
* Finish task#58591.
See merge request easycorp/zentaopms!4147
|
2022-06-27 09:16:56 +00:00 |
|
|
zhouxudong
|
eaa39c7f0f
|
* Finish task #58576 #58577.
|
2022-06-27 09:14:37 +00:00 |
|
|
xieqiyu
|
9b1c865964
|
* Code for task#57854.
|
2022-06-27 17:11:59 +08:00 |
|
|
孙广明
|
85ac450243
|
Merge branch 'sprint/207_mayue_bug#24049' into 'master'
* Fix bug #24049.
See merge request easycorp/zentaopms!4155
|
2022-06-27 08:54:19 +00:00 |
|
|
xieqiyu
|
8dd618528a
|
* Fix test bug.
|
2022-06-27 16:51:53 +08:00 |
|
|
tanghucheng
|
a8834418f1
|
* Fix bug #24340.
|
2022-06-27 16:50:39 +08:00 |
|
|
leiyong
|
f8087acd1d
|
* Finish task#58598.
|
2022-06-27 08:49:52 +00:00 |
|
|
leiyong
|
a2fe525436
|
* Finish task#58598.
|
2022-06-27 08:49:35 +00:00 |
|
|
zhouxudong
|
6314aad2e3
|
* Finish task #58575 #58602.
|
2022-06-27 08:38:11 +00:00 |
|
|
hufangzhou
|
b98e169fa4
|
* Finish task #58563.
|
2022-06-27 16:33:32 +08:00 |
|
|
tianshujie
|
26f37ec09c
|
* Finish task #58560.
|
2022-06-27 15:38:33 +08:00 |
|
|
zhouxudong
|
446ec44f29
|
* Finish task #58576 #58577.
|
2022-06-27 07:36:13 +00:00 |
|
|
王怡栋
|
ff3052113a
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug #24368.
See merge request easycorp/zentaopms!4146
|
2022-06-27 06:58:04 +00:00 |
|
|
hufangzhou
|
f9f3b0c716
|
* Code for task #58568.
|
2022-06-27 14:52:11 +08:00 |
|
|
李玉春
|
677381331d
|
Merge branch 'gitlab_bug' into 'master'
* Modify apit params.
See merge request easycorp/zentaopms!4149
|
2022-06-27 06:46:11 +00:00 |
|
|
xieqiyu
|
08faa3edff
|
* Finish task#57854.
|
2022-06-27 13:33:11 +08:00 |
|
|
caoyanyi
|
73472acf0a
|
* Modify apit params.
|
2022-06-27 13:07:22 +08:00 |
|
|
xieqiyu
|
78e86b9493
|
* Finish task#58591.
|
2022-06-27 11:25:11 +08:00 |
|
|
zhouxudong
|
69b87ae29f
|
* Fix bug #24368.
|
2022-06-27 03:20:49 +00:00 |
|
|
王怡栋
|
ac517392f4
|
Merge branch 'sprint/208_tianshujie_58551' into 'master'
Sprint/208 tianshujie 58551
See merge request easycorp/zentaopms!4145
|
2022-06-27 03:19:31 +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 |
|
|
孙广明
|
08b8b3557f
|
Merge branch 'sprint205_leiyong_bug_24036' into 'master'
* Adjust CSS.
See merge request easycorp/zentaopms!4138
|
2022-06-27 02:49:09 +00:00 |
|
|
孙广明
|
74eea79797
|
Merge branch 'zg_57907' into 'master'
* Code for task#57907
See merge request easycorp/zentaopms!4141
|
2022-06-27 02:49:02 +00:00 |
|
|
tianshujie
|
651d16675a
|
* Finish task #58551.
|
2022-06-27 10:19:41 +08:00 |
|
|
tianshujie
|
ba16bac74f
|
* Add permission judgment.
|
2022-06-27 10:05:18 +08:00 |
|
|
zhouxudong
|
14766c32f6
|
* Finish task #57860.
|
2022-06-27 00:39:37 +00:00 |
|
|
mayue
|
35383bc86f
|
* Fix bug #24049.
|
2022-06-24 18:42:44 +08:00 |
|
|
朱金勇
|
88e2ca8a01
|
Merge branch 'sprint/scx_tokenlogin' into 'master'
* Login action are recorded by default.
See merge request easycorp/zentaopms!4130
|
2022-06-24 07:42:01 +00:00 |
|
|
tianshujie
|
468db7bc30
|
* Fix bug #23955.
|
2022-06-24 14:30:37 +08:00 |
|
|
李玉春
|
c12226f606
|
Merge branch 'cyy_style' into 'master'
* Modify style for select.
See merge request easycorp/zentaopms!4124
|
2022-06-24 06:29:55 +00:00 |
|
|
李玉春
|
45315877e2
|
Merge branch 'sprint/206_liumengyi_fixbug' into 'master'
* Code review.
See merge request easycorp/zentaopms!4140
|
2022-06-24 06:28:46 +00:00 |
|
|
liumengyi
|
b920b76042
|
* Code review.
|
2022-06-24 14:20:33 +08:00 |
|