 zenggang
|
6600b76ad9
|
* Fix bug #26307
|
2022-08-11 07:01:08 +00:00 |
|
|
wangyidong
|
1915ef01e5
|
* fix for get plans when no product.
|
2022-08-11 14:21:22 +08:00 |
|
|
wangyidong
|
d4ed167e7a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-11 14:12:52 +08:00 |
|
|
wangyidong
|
579d614d77
|
Merge branch 'sprint/devplat_31'
|
2022-08-11 14:12:44 +08:00 |
|
|
王怡栋
|
0125b85cd4
|
Merge branch 'sprint/master_guofeilong_fixbug_261443' into 'master'
Sprint/master guofeilong fixbug 261443
See merge request easycorp/zentaopms!4925
|
2022-08-11 06:00:45 +00:00 |
|
|
liuruogu
|
64acdb8693
|
* Fix bug #26173.
|
2022-08-11 05:53:27 +00:00 |
|
|
guofeilong
|
25444755d3
|
* Delete debugger
|
2022-08-11 05:51:42 +00:00 |
|
|
guofeilong
|
04c79e6fbb
|
* Fix bug #26143
|
2022-08-11 05:49:24 +00:00 |
|
|
liuruogu
|
5a6d41baed
|
* Fix bug #26173.
|
2022-08-11 05:47:19 +00:00 |
|
|
sunguangming
|
a978f21f69
|
* Fix file unit case.
|
2022-08-11 13:31:51 +08:00 |
|
|
sunguangming
|
17c5bdca14
|
* Add unit case for file.
|
2022-08-11 13:21:50 +08:00 |
|
|
王怡栋
|
61f3904ff0
|
Merge branch 'sprint/devplat_31' into 'master'
* Add flow fields when upgrade from biz7.3.
See merge request easycorp/zentaopms!4922
|
2022-08-11 05:20:51 +00:00 |
|
|
王怡栋
|
fd4ad2daaa
|
Merge branch 'sprint/hufangzhou_updateLang' into 'master'
* Modify the lang item.
See merge request easycorp/zentaopms!4921
|
2022-08-11 04:12:06 +00:00 |
|
|
王怡栋
|
dca269ee84
|
Merge branch 'importExport' into 'master'
* Code for port.
See merge request easycorp/zentaopms!4918
|
2022-08-11 04:11:23 +00:00 |
|
|
王怡栋
|
8e722c7d98
|
Merge branch 'master_xieqiyu_63769' into 'master'
* Finish task#63769.
See merge request easycorp/zentaopms!4916
|
2022-08-11 04:10:48 +00:00 |
|
|
hufangzhou
|
9e80429e03
|
* Modify the lang item.
|
2022-08-11 11:34:02 +08:00 |
|
|
daitingting
|
bbf17e6bff
|
* Add flow fields when upgrade from biz7.3.
|
2022-08-11 03:22:42 +00:00 |
|
|
胡方舟
|
f2365a4937
|
Merge branch 'sprint/tianshujie' into 'master'
* Initializes the module control.
See merge request easycorp/zentaopms!4919
|
2022-08-11 03:07:20 +00:00 |
|
|
孙广明
|
22b0ba7314
|
Merge branch 'sprint/224_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!4920
|
2022-08-11 02:56:57 +00:00 |
|
|
hufangzhou
|
e97a5a7361
|
* Add the new version.
|
2022-08-11 10:55:29 +08:00 |
|
|
tianshujie
|
bfbf6bcc45
|
* Initializes the module control.
|
2022-08-11 10:53:17 +08:00 |
|
|
xieqiyu
|
809b70a5b8
|
* Code for task#63769. Story#32949.
|
2022-08-11 10:29:04 +08:00 |
|
|
tanghucheng
|
47ad64d1bc
|
* Code for port.
|
2022-08-11 10:27:03 +08:00 |
|
|
王怡栋
|
8901f60b25
|
Merge branch 'sprint/224_liumengyi_fixbug' into 'master'
* Fix bug #26246.
See merge request easycorp/zentaopms!4917
|
2022-08-11 02:26:49 +00:00 |
|
|
王怡栋
|
1ccc55aea4
|
Merge branch 'fix_bug#25891' into 'master'
* Fix bug 25891.
See merge request easycorp/zentaopms!4915
|
2022-08-11 02:15:29 +00:00 |
|
|
王怡栋
|
0fca3e9f13
|
Merge branch 'leiyong_fix_bug_0811' into 'master'
* Fix single sign-on.
See merge request easycorp/zentaopms!4914
|
2022-08-11 02:15:16 +00:00 |
|
|
王怡栋
|
93947c8127
|
Merge branch 'sprint/master_zhouxudong_26294' into 'master'
* Fix bug #26294.
See merge request easycorp/zentaopms!4913
|
2022-08-11 02:15:06 +00:00 |
|
|
王怡栋
|
ce74ee1f30
|
Merge branch 'sprint/max41_mayue_bug#26242' into 'master'
Sprint/max41 mayue bug#26242
See merge request easycorp/zentaopms!4911
|
2022-08-11 02:14:55 +00:00 |
|
|
mayue
|
b7310d4748
|
* Fix bug 25891.
|
2022-08-11 10:12:23 +08:00 |
|
|
xieqiyu
|
8e5360356b
|
* Finish task#63769.
|
2022-08-11 10:11:54 +08:00 |
|
|
liumengyi
|
845b829aaa
|
* Fix bug #26246.
|
2022-08-11 10:08:06 +08:00 |
|
|
leiyong
|
489fa70400
|
* Fix single sign-on.
|
2022-08-11 01:54:32 +00:00 |
|
|
zhouxudong
|
837a32960f
|
* Fix bug #26294.
|
2022-08-11 01:46:07 +00:00 |
|
|
胡方舟
|
3509dfa1fa
|
Merge branch 'spirnt/224_tianshujie_bug' into 'master'
Spirnt/224 tianshujie bug
See merge request easycorp/zentaopms!4912
|
2022-08-11 01:39:52 +00:00 |
|
|
王怡栋
|
96821f5be9
|
Merge branch 'sprint/224_liumengyi_fixbug' into 'master'
* Add bug test unit.
See merge request easycorp/zentaopms!4909
|
2022-08-11 01:32:38 +00:00 |
|
|
tianshujie
|
6c0c3a3cda
|
* Fix bug #26110.
|
2022-08-11 09:30:06 +08:00 |
|
|
mayue
|
f2824517be
|
* Add column min width.
|
2022-08-11 09:25:13 +08:00 |
|
|
wangyidong
|
124b8fdc01
|
Merge branch 'master_liuhong_63787'
|
2022-08-11 09:23:14 +08:00 |
|
|
王怡栋
|
7c2d2b54eb
|
Merge branch 'master' into 'master_liuhong_63787'
# Conflicts:
# module/program/css/browse.css
# module/project/css/browse.css
|
2022-08-11 01:22:50 +00:00 |
|
|
王怡栋
|
59c325d565
|
Merge branch 'sprint/224_dongli_63669' into 'master'
* Fix bug #63669.
See merge request easycorp/zentaopms!4908
|
2022-08-11 01:19:17 +00:00 |
|
|
mayue
|
28b14dd33d
|
* Fix bug #26242.
|
2022-08-11 09:15:35 +08:00 |
|
|
wangyidong
|
289ee7b1b1
|
* adjust for api.
|
2022-08-11 09:01:43 +08:00 |
|
|
liuhong
|
f713f01ee7
|
*Finish task #63787.
|
2022-08-11 00:49:21 +00:00 |
|
|
tianshujie
|
ad2cab0eff
|
* Fix bug #26186.
|
2022-08-11 08:34:12 +08:00 |
|
|
liumengyi
|
b5d1558689
|
* Add bug test unit.
|
2022-08-11 08:27:01 +08:00 |
|
|
孙广明
|
d4df3b975d
|
Merge branch 'lyk_fixbug' into 'master'
* Fix bug of xiangmu
See merge request easycorp/zentaopms!4906
|
2022-08-11 00:18:46 +00:00 |
|
|
dongli
|
91908bc56b
|
* Fix bug #63669.
|
2022-08-10 23:59:31 +00:00 |
|
|
王怡栋
|
d4724e0b8b
|
Merge branch 'sprint/max41_mayue_bug#26247' into 'master'
* Fix bug #26247.
See merge request easycorp/zentaopms!4907
|
2022-08-10 21:17:44 +00:00 |
|
|
王怡栋
|
1d4c64c4c1
|
Merge branch 'sprint/224_liumengyi_fixbug' into 'master'
Sprint/224 liumengyi fixbug
See merge request easycorp/zentaopms!4905
|
2022-08-10 20:58:24 +00:00 |
|
|
王怡栋
|
5b8f34ec6a
|
Merge branch 'importExport' into 'master'
* Code for port.
See merge request easycorp/zentaopms!4904
|
2022-08-10 19:53:23 +00:00 |
|