Commit Graph
34451 Commits
Author SHA1 Message Date
zhouxudong a7484fe721 * Fix task #49881. 2022-03-07 13:50:32 +08:00
zhouxudong a312035c1b * Fix task #49881. 2022-03-07 11:17:40 +08:00
zhouxudong bb3be7d065 * Finish task #49881. 2022-03-07 09:31:22 +08:00
zhouxudong a6e3844561 * Finish task #49881. 2022-02-25 09:33:43 +08:00
王怡栋 19b2d74e48 Merge branch 'sgm_upgrade' into 'sprint/185'
* Add version.

See merge request easycorp/zentaopms!1971
2022-02-25 01:23:08 +00:00
孙广明 0e10b648d2 Merge branch 'sprint/186_tianshujie_vision' into 'sprint/185'
* Fix the problem of calling config error in static method.

See merge request easycorp/zentaopms!1972
2022-02-25 01:13:58 +00:00
tianshujie ecf679aeaf * Fix the problem of calling config error in static method. 2022-02-25 09:12:19 +08:00
孙广明 3989ed849b * Add version. 2022-02-25 09:09:48 +08:00
王怡栋 a6b304473e Merge branch 'sgm_upgrade' into 'sprint/185'
* Add version.

See merge request easycorp/zentaopms!1970
2022-02-25 01:09:14 +00:00
孙广明 353e3bc11a * Add version. 2022-02-25 09:05:58 +08:00
孙广明 6824032257 Merge branch 'sprint/186_liumengyi_modify' into sprint/185 2022-02-25 08:42:17 +08:00
孙广明 25f71e0a51 Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'
# Conflicts:
#   module/task/model.php
2022-02-25 00:41:58 +00:00
孙广明 bb7a5fc073 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
* code for task #49337.

See merge request easycorp/zentaopms!1969
2022-02-25 00:36:52 +00:00
王怡栋 fb58eaea2b * code for task #49337. 2022-02-24 17:28:12 +08:00
孙广明 c8ba9488c6 Merge branch 'sprint/185_zhouxin_20032' into 'sprint/185'
Fix bug.

See merge request easycorp/zentaopms!1967
2022-02-24 09:23:53 +00:00
zhouxin 7ae4495abb Fix bug. 2022-02-24 09:21:58 +00:00
liumengyi d605fd3f2d * Modify project config edition. 2022-02-24 17:20:50 +08:00
王怡栋 a6c782de7b Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* move to extension

See merge request easycorp/zentaopms!1963
2022-02-24 09:06:41 +00:00
孙广明 32f322ec51 Merge branch 'sprint/186_tianshujie_version' into 'sprint/185'
Sprint/186 tianshujie version

See merge request easycorp/zentaopms!1960
2022-02-24 09:04:10 +00:00
tianshujie 9f76842034 * Modify the code format. 2022-02-24 17:03:19 +08:00
Zongjun Lan 2cc1105512 * fix move extensions to module 2022-02-24 16:59:39 +08:00
孙广明 a62e897d12 Merge branch 'sprint/185_zhouxudong_19363' into 'sprint/185'
Sprint/185 zhouxudong 19363

See merge request easycorp/zentaopms!1966
2022-02-24 08:55:49 +00:00
zhouxudong 6559ada4a4 * Fix bug #19363. 2022-02-24 16:54:04 +08:00
Zongjun Lan 45a704c490 * fix lane error 2022-02-24 16:50:49 +08:00
tianshujie 34752d2c04 * Modify version judgment logic. 2022-02-24 16:49:56 +08:00
zhouxudong ed2c8c0b0a * Fix bug #19363. 2022-02-24 16:45:56 +08:00
liumengyi 9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
孙广明 8ee49bb3ba Merge branch 'sprint/185_hufangzhou_makefile' into 'sprint/185'
* Rewrite the Makefile.

See merge request easycorp/zentaopms!1961
2022-02-24 08:22:45 +00:00
Zongjun Lan d97c7ee4a2 * move to extension 2022-02-24 16:22:27 +08:00
tianshujie 30d3fc1303 * Modify version judgment logic. 2022-02-24 16:21:58 +08:00
孙广明 8cbc861ec1 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
* adjust for set vision.

See merge request easycorp/zentaopms!1962
2022-02-24 08:20:31 +00:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
hufangzhou bc89a1051d * Rewrite the Makefile. 2022-02-24 16:17:25 +08:00
王怡栋 34395b7a41 * adjust for set vision. 2022-02-24 16:17:09 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
孙广明 39c8e0a2e7 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1957
2022-02-24 08:09:43 +00:00
zhujinyong e21fe4bf8a Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-24 16:02:40 +08:00
zhujinyong c7708b55cc * Adjust style of vision switcher. 2022-02-24 16:02:17 +08:00
tianshujie 30c5d7a991 * Modify the prompt page for deleting files。 2022-02-24 15:47:03 +08:00
李玉春 ceb94155c5 Merge branch 'sgm_fixbug' into 'sprint/185'
* Fix group bug.

See merge request easycorp/zentaopms!1956
2022-02-24 07:43:44 +00:00
孙广明 59f2dc528b Merge branch 'sprint/186_liumengyi_19955' into 'sprint/185'
* Finish bug #19955.

See merge request easycorp/zentaopms!1952
2022-02-24 07:41:54 +00:00
孙广明 f9ed1e1dd9 * Fix group bug. 2022-02-24 15:41:12 +08:00
李玉春 c3cc3eabd9 Merge branch 'sprint/185_fixbug_zxd' into 'sprint/185'
Sprint/185 fixbug zxd

See merge request easycorp/zentaopms!1955
2022-02-24 07:38:05 +00:00
zhouxudong 8a9824bc98 * Fix bug . 2022-02-24 15:28:01 +08:00
zhouxudong 88163d846f * Fix bug . 2022-02-24 15:22:12 +08:00
孙广明 bdaf8ced98 Merge branch 'sprint/185_zhouxin_49281' into 'sprint/185'
Sprint/185 zhouxin 49281

See merge request easycorp/zentaopms!1950
2022-02-24 07:19:35 +00:00
zhouxin 74a2b622f4 Adjust code. 2022-02-24 07:15:07 +00:00
zhouxin 132cbb4aaa Adjust code. 2022-02-24 06:59:39 +00:00
zhujinyong 0ba3f443cf * Fix loadExtension. 2022-02-24 14:58:02 +08:00
李玉春 140fce609f Merge branch 'sprint/185_fixbug_19999' into 'sprint/185'
* Fixbug 19999.

See merge request easycorp/zentaopms!1953
2022-02-24 06:53:32 +00:00