 liumengyi
|
7b80bfeedd
|
* Fix bug #23422.
|
2022-06-08 15:43:17 +08:00 |
|
|
liumengyi
|
a7fcd0f372
|
* Fix bug #23416.
|
2022-06-08 15:33:49 +08:00 |
|
|
liumengyi
|
be664e6368
|
* Fix bug.
|
2022-06-08 15:23:00 +08:00 |
|
|
王怡栋
|
196b78a0aa
|
Merge branch 'sprint/201_tianshujie_56476' into 'master'
Sprint/201 tianshujie 56476
See merge request easycorp/zentaopms!3794
|
2022-06-08 06:48:46 +00:00 |
|
|
孙广明
|
cb4776df2d
|
Merge branch 'sprint/200_zhouxudong_56379' into 'master'
Sprint/200 zhouxudong 56379
See merge request easycorp/zentaopms!3785
|
2022-06-08 06:46:21 +00:00 |
|
|
王怡栋
|
df6d8bcb0e
|
Merge branch 'sprint/201' into 'master'
Sprint/201
See merge request easycorp/zentaopms!3793
|
2022-06-08 06:45:01 +00:00 |
|
|
孙广明
|
dda429d7e7
|
Merge branch 'sprint/199_mayue_story#9206' into 'master'
* Finish story#9206.
See merge request easycorp/zentaopms!3792
|
2022-06-08 06:43:33 +00:00 |
|
|
mayue
|
1e69f979cd
|
* Optimize code.
|
2022-06-08 14:42:03 +08:00 |
|
|
zhouxudong
|
b2cff31389
|
* Finish task #56379.
|
2022-06-08 06:41:28 +00:00 |
|
|
zhouxudong
|
16e9d31d15
|
* Finish task #56379.
|
2022-06-08 06:36:13 +00:00 |
|
|
王怡栋
|
4318bb9305
|
Merge branch 'sprint/hufangzhou_adjustMakefile' into 'master'
* Adjust the makefile for deb and rpm package name.
See merge request easycorp/zentaopms!3789
|
2022-06-08 06:29:54 +00:00 |
|
|
hufangzhou
|
28682a5e15
|
* Adjust the makefile for deb and rpm package name.
|
2022-06-08 14:13:58 +08:00 |
|
|
王怡栋
|
7f907e2d19
|
Merge branch 'sprint/fixbug_liumengyi_fixbug' into 'master'
* Fix bug #23407.
See merge request easycorp/zentaopms!3786
|
2022-06-08 05:51:33 +00:00 |
|
|
王怡栋
|
c3cfd4fea3
|
Merge branch 'sprint/201_liumengyi_56454' into 'sprint/201'
* Finish task #56454.
See merge request easycorp/zentaopms!3788
|
2022-06-08 05:51:11 +00:00 |
|
|
liumengyi
|
d0e34c1f19
|
* Code optimize.
|
2022-06-08 13:50:15 +08:00 |
|
|
mayue
|
d64e16d4ef
|
* Finish story#9206.
|
2022-06-08 13:48:36 +08:00 |
|
|
liumengyi
|
bf33186b82
|
* Add annotation.
|
2022-06-08 13:45:14 +08:00 |
|
|
liumengyi
|
0fe197894b
|
* Fix bug of task #56454.
|
2022-06-08 13:44:27 +08:00 |
|
|
liumengyi
|
2a9f945c77
|
* Fix bug #23407.
|
2022-06-08 13:25:06 +08:00 |
|
|
liumengyi
|
cbdefb47fd
|
* Fix bug of task #56454.
|
2022-06-08 13:18:21 +08:00 |
|
|
liumengyi
|
d1e74eb74a
|
* Fix bug of task #56454.
|
2022-06-08 13:10:13 +08:00 |
|
|
tianshujie
|
9cb0df56c6
|
* Finish task #56453.
|
2022-06-08 11:05:32 +08:00 |
|
|
王怡栋
|
451d897d09
|
Merge branch 'sgm_license' into 'master'
* Remove unused file and change license.
See merge request easycorp/zentaopms!3782
zentaopms_17.0
|
2022-06-08 02:38:51 +00:00 |
|
|
王怡栋
|
84d33d5f3c
|
Merge branch 'sprint/fixbug_liumengyi_23340' into 'master'
* Fix bug #23340.
See merge request easycorp/zentaopms!3781
|
2022-06-08 02:38:12 +00:00 |
|
|
liumengyi
|
5511a51882
|
* Fix bug #23340.
|
2022-06-08 10:35:41 +08:00 |
|
|
孙广明
|
304f50eef0
|
* Remove unused file and change license.
|
2022-06-08 10:34:19 +08:00 |
|
|
liumengyi
|
5e74d3bd9f
|
* Finish task #56454.
|
2022-06-08 10:32:01 +08:00 |
|
|
王怡栋
|
50f3eb7f71
|
Merge branch 'sgm_license' into 'master'
* Change zentao license.
See merge request easycorp/zentaopms!3779
|
2022-06-08 02:05:46 +00:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
zhouxudong
|
757b86bf33
|
* Finish task #56379.
|
2022-06-08 01:52:34 +00:00 |
|
|
zhouxudong
|
56419e17a8
|
* Finish task #56379.
|
2022-06-08 01:39:24 +00:00 |
|
|
王怡栋
|
369f08a0c4
|
Merge branch 'sgm_license' into 'master'
* Change license.
See merge request easycorp/zentaopms!3776
|
2022-06-08 01:36:34 +00:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
zhouxudong
|
dd10aa75f0
|
* Finish task #56366 #56379 #56382 #56380
|
2022-06-08 01:06:07 +00:00 |
|
|
王怡栋
|
3d34ddcd33
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!3773
|
2022-06-07 09:05:07 +00:00 |
|
|
tanghucheng
|
146d8f9f38
|
* Fix bug .
|
2022-06-07 17:03:57 +08:00 |
|
|
zhouxudong
|
b4a27adf49
|
* Finish task #56379 #56382 #56380.
|
2022-06-07 08:16:04 +00:00 |
|
|
孙广明
|
d1c824509c
|
Merge branch 'sprint/tianshujie_23349' into 'master'
* Fix bug #23349.
See merge request easycorp/zentaopms!3772
|
2022-06-07 08:01:45 +00:00 |
|
|
tianshujie
|
ff8e718b37
|
* Fix bug #23349.
|
2022-06-07 16:00:28 +08:00 |
|
|
zhouxudong
|
4ecda5bee6
|
* Finish task #56380 #56379.
|
2022-06-07 07:44:21 +00:00 |
|
|
tianshujie
|
c7b1da840f
|
* Fix bug #56476.
|
2022-06-07 15:14:24 +08:00 |
|
|
zhouxudong
|
02e7d183c7
|
* Finish task #56379.
|
2022-06-07 07:01:44 +00:00 |
|
|
王怡栋
|
7b709fc816
|
Merge branch 'sgm_removecode' into 'master'
* Remove unused code.
See merge request easycorp/zentaopms!3769
|
2022-06-07 06:56:14 +00:00 |
|
|
孙广明
|
fcd7183dbb
|
* Remove unused code.
|
2022-06-07 14:52:48 +08:00 |
|
|
孙广明
|
5281be0b32
|
Merge branch 'sprint/scx_header' into 'master'
* SupportLang.
See merge request easycorp/zentaopms!3763
|
2022-06-07 06:51:54 +00:00 |
|
|
孙广明
|
06f1bc6dff
|
Merge branch 'sprint/sunhao/bug23284' into 'master'
* bug #23284, fix simplemde error.
See merge request easycorp/zentaopms!3765
|
2022-06-07 06:50:09 +00:00 |
|
|
李玉春
|
c8c1bfc4c0
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #23358.
See merge request easycorp/zentaopms!3768
|
2022-06-07 06:49:05 +00:00 |
|
|
tianshujie
|
ee2d74d99d
|
* Fix bug #23358.
|
2022-06-07 14:43:42 +08:00 |
|
|
王怡栋
|
b2a576b958
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #23348,23349.
See merge request easycorp/zentaopms!3767
|
2022-06-07 06:08:09 +00:00 |
|
|
tianshujie
|
a396ad68c4
|
* Fix bug #23348,23349.
|
2022-06-07 13:55:45 +08:00 |
|