 tianshujie
|
4f65445e8e
|
* Code for finish task #84576.
|
2023-02-15 16:31:18 +08:00 |
|
|
zhujinyong
|
f1e1580ef7
|
* Finish task #84596.
|
2023-02-15 10:25:30 +08:00 |
|
|
tianshujie
|
f989173e10
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-15 08:29:48 +08:00 |
|
|
孙广明
|
b6f4477420
|
Merge branch 'tsj_sortable' into 'zentaopms_284'
Tsj sortable
See merge request easycorp/zentaopms!6945
|
2023-02-15 00:21:22 +00:00 |
|
|
hufangzhou
|
2aec80f62c
|
* Fix bug #32140.
|
2023-02-14 17:36:21 +08:00 |
|
|
hufangzhou
|
0b89cd77d5
|
* Fix bug of task #83954.
|
2023-02-14 08:49:53 +00:00 |
|
|
liumengyi
|
f12271a1f2
|
* Finish task #84592.
|
2023-02-14 16:24:14 +08:00 |
|
|
王怡栋
|
e7991dcc5f
|
Merge branch 'ticket_369' into 'master'
* Adjust code for feedback #2187.
See merge request easycorp/zentaopms!6946
|
2023-02-14 08:09:40 +00:00 |
|
|
王怡栋
|
39388b32f7
|
Merge branch 'sprint/hufangzhou_fixlang' into 'master'
* Adjust the lang.
See merge request easycorp/zentaopms!6948
|
2023-02-14 08:03:56 +00:00 |
|
|
王怡栋
|
2c1a4b6113
|
Merge branch 'sprint/hufangzhou_bug_32104' into 'master'
* Fix bug #32104.
See merge request easycorp/zentaopms!6947
|
2023-02-14 08:03:39 +00:00 |
|
|
hufangzhou
|
30a251154e
|
* Fix bug #31933.
|
2023-02-14 15:59:09 +08:00 |
|
|
王怡栋
|
48a2dc05bb
|
Merge branch 'dev/gfl_bug#32126' into 'master'
* Code for bug #32126.
See merge request easycorp/zentaopms!6949
|
2023-02-14 07:52:05 +00:00 |
|
|
guofeilong
|
dfa0267045
|
* Code for bug #32126.
|
2023-02-14 15:45:28 +08:00 |
|
|
hufangzhou
|
cc4b6d5310
|
* Adjust the lang.
|
2023-02-14 15:35:45 +08:00 |
|
|
hufangzhou
|
63f0c823da
|
* Fix bug #32104.
|
2023-02-14 15:21:20 +08:00 |
|
|
Yagami
|
786dacf52d
|
* Fix bug #31524.
|
2023-02-14 15:05:22 +08:00 |
|
|
liumengyi
|
48da3660e9
|
* Finish task #84585.
|
2023-02-14 14:03:37 +08:00 |
|
|
liuhong
|
254c6e9747
|
* Adjust code for feedback #2187.
|
2023-02-14 05:42:50 +00:00 |
|
|
tianshujie
|
1e0346d696
|
Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sortable
|
2023-02-14 13:32:06 +08:00 |
|
|
tianshujie
|
836ce16b03
|
* Code for finish task #84575.
|
2023-02-14 13:29:36 +08:00 |
|
|
孙广明
|
2ce8e96e31
|
Merge branch 'zenops_61' into 'master'
* Fix bug #32108.
See merge request easycorp/zentaopms!6944
|
2023-02-14 05:25:36 +00:00 |
|
|
zhaoke
|
9c920b1547
|
* Fix bug #32108.
|
2023-02-14 05:22:37 +00:00 |
|
|
liumengyi
|
00d8f85005
|
* Finish task #84584.
|
2023-02-14 13:21:33 +08:00 |
|
|
liumengyi
|
7ea51e54b5
|
* Finish task #84584.
|
2023-02-14 13:13:46 +08:00 |
|
|
王怡栋
|
20f17196b2
|
Merge branch 'ticket_366' into 'master'
Ticket 366
See merge request easycorp/zentaopms!6941
|
2023-02-14 05:04:09 +00:00 |
|
|
王怡栋
|
5c28eb1317
|
Merge branch 'daitingting_bug_#31996' into 'master'
* Fix bug #31996.
See merge request easycorp/zentaopms!6940
|
2023-02-14 05:03:43 +00:00 |
|
|
王怡栋
|
c31e104d8a
|
Merge branch 'bug_32099' into 'master'
* Fix bug#32099
See merge request easycorp/zentaopms!6939
|
2023-02-14 05:03:13 +00:00 |
|
|
hufangzhou
|
56c2cdcb21
|
* Finish task #83954.
|
2023-02-14 02:46:34 +00:00 |
|
|
zenggang
|
397a40f648
|
* Fix bug#32099
|
2023-02-14 02:19:03 +00:00 |
|
|
王怡栋
|
a9cd5ed97b
|
Merge branch 'dev/gfl_finish_bug_in_flow-item' into 'master'
* code for delete / after background-image: url
See merge request easycorp/zentaopms!6938
|
2023-02-14 02:00:13 +00:00 |
|
|
guofeilong
|
bc88bfece2
|
* code for delete / after background-image: url
|
2023-02-14 09:56:33 +08:00 |
|
|
liuhong
|
e9d2d7362a
|
* Adjust code for feedback #2191
|
2023-02-14 01:43:35 +00:00 |
|
|
liuhong
|
f86fe5a65d
|
* Adjust code for feedback 2191.
|
2023-02-14 01:08:45 +00:00 |
|
|
tianshujie
|
dbad8ab513
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-14 08:52:02 +08:00 |
|
|
zhujinyong
|
6e2c57ab49
|
* Finish task #84597.
|
2023-02-13 17:26:19 +08:00 |
|
|
王怡栋
|
50f2598c54
|
Merge branch 'master_xieqiyu_32089' into 'master'
* Code for bug#32089.
See merge request easycorp/zentaopms!6934
|
2023-02-13 09:24:17 +00:00 |
|
|
王怡栋
|
665081924d
|
Merge branch 'sprint/hufangzhou_bug_32073' into 'master'
* Fix bug #32073.
See merge request easycorp/zentaopms!6933
|
2023-02-13 09:24:03 +00:00 |
|
|
王怡栋
|
67591cc509
|
Merge branch 'master_xieqiyu_26428' into 'master'
* Code for bug#26428.
See merge request easycorp/zentaopms!6932
|
2023-02-13 09:23:43 +00:00 |
|
|
王怡栋
|
a18abcc5c8
|
Merge branch 'ticket_336' into 'master'
Ticket 336
See merge request easycorp/zentaopms!6931
|
2023-02-13 09:23:10 +00:00 |
|
|
王怡栋
|
9b95d6e487
|
Merge branch 'sprint/hufangzhou_bug_32075' into 'master'
* Fix bug #32075.
See merge request easycorp/zentaopms!6930
|
2023-02-13 09:22:40 +00:00 |
|
|
孙广明
|
1d2ef1445c
|
Merge branch 'zenops_61' into 'master'
Fix bugs
See merge request easycorp/zentaopms!6935
|
2023-02-13 09:11:38 +00:00 |
|
|
xieqiyu
|
b0b04b0144
|
* Code for bug#32089.
|
2023-02-13 17:08:33 +08:00 |
|
|
liumengyi
|
005c91c8a4
|
* Finish task #84599.
|
2023-02-13 16:51:25 +08:00 |
|
|
liumengyi
|
1aaefb79d3
|
* Fix bug of merge code.
|
2023-02-13 16:43:02 +08:00 |
|
|
liumengyi
|
f9daa6072b
|
* Fix bug of merge code.
|
2023-02-13 16:35:51 +08:00 |
|
|
hufangzhou
|
7108816fa5
|
* Fix bug #32073.
|
2023-02-13 16:30:13 +08:00 |
|
|
liumengyi
|
bc4c383fa5
|
* Finish task #84582.
|
2023-02-13 16:12:24 +08:00 |
|
|
xieqiyu
|
19c28c527e
|
* Code for bug#26428.
|
2023-02-13 16:06:20 +08:00 |
|
|
zhaoke
|
880318bc1b
|
* Move automation btn.
|
2023-02-13 07:50:50 +00:00 |
|
|
liumengyi
|
2379ab313a
|
* Finish task #84582.
|
2023-02-13 15:36:41 +08:00 |
|