 孙广明
|
5ff5699d91
|
* Fix bug.
|
2022-02-25 17:11:58 +08:00 |
|
|
孙广明
|
c1ebe28837
|
* Fix bug.
|
2022-02-25 15:39:08 +08:00 |
|
|
zhujinyong
|
762c60d0d0
|
* Fix extLangPath.
|
2022-02-25 15:17:53 +08:00 |
|
|
zhujinyong
|
a33ba80fb4
|
* Adjust language of router.
|
2022-02-25 14:58:58 +08:00 |
|
|
孙广明
|
3627387370
|
Merge branch 'sprint/185_mayue_49285' into 'sprint/185'
* Finish task#49285.
See merge request easycorp/zentaopms!1871
|
2022-02-25 06:32:20 +00:00 |
|
|
mayue
|
37a9564c95
|
* Optimize code.
|
2022-02-25 14:20:37 +08:00 |
|
|
mayue
|
c3ef97bf47
|
* Optimize code.
|
2022-02-25 14:15:25 +08:00 |
|
|
mayue
|
245542e972
|
* Optimize code.
|
2022-02-25 14:00:54 +08:00 |
|
|
王怡栋
|
4f4144b72f
|
Merge branch 'sprint/185_tanghucheng_fixbug' into 'sprint/185'
* Fix bug #19898,20028.
See merge request easycorp/zentaopms!1981
|
2022-02-25 05:45:43 +00:00 |
|
|
孙广明
|
8f89f4d64f
|
Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529
See merge request easycorp/zentaopms!1958
|
2022-02-25 05:45:27 +00:00 |
|
|
孙华伟
|
68ef9809dd
|
*
|
2022-02-25 13:37:32 +08:00 |
|
|
孙广明
|
7ba3ed1dfc
|
Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.
See merge request easycorp/zentaopms!1980
|
2022-02-25 05:26:24 +00:00 |
|
|
zhengrunyu
|
748fbfe340
|
* Fix bug.
|
2022-02-25 13:24:30 +08:00 |
|
|
mayue
|
c763f12188
|
* Optimize code.
|
2022-02-25 13:20:18 +08:00 |
|
|
zhengrunyu
|
10d7e4cdec
|
* Fix bug.
|
2022-02-25 13:15:54 +08:00 |
|
|
tanghucheng
|
3369cdbef6
|
* Fix bug #19898,20028.
|
2022-02-25 11:09:32 +08:00 |
|
|
孙华伟
|
0067119fbe
|
*Fix bug #19959 #19963
|
2022-02-25 11:08:38 +08:00 |
|
|
孙华伟
|
47e2415b16
|
*Fix bug #19959 #19963 .
|
2022-02-25 11:06:20 +08:00 |
|
|
zhengrunyu
|
b641170d85
|
* Fix bug 19941 19923 19922 19787.
|
2022-02-25 11:01:31 +08:00 |
|
|
王怡栋
|
e411f0e18f
|
Merge branch 'sgm_upgrade' into 'sprint/185'
* Add code.
See merge request easycorp/zentaopms!1979
|
2022-02-25 02:59:45 +00:00 |
|
|
孙广明
|
917d5cc6a5
|
* Add code.
|
2022-02-25 10:57:45 +08:00 |
|
|
孙广明
|
4f1ed945dc
|
Merge branch 'sprint/186_tianshujie_20045' into 'sprint/185'
* Fix bug #20045.
See merge request easycorp/zentaopms!1978
|
2022-02-25 02:47:32 +00:00 |
|
|
tianshujie
|
9e9181ccfb
|
* Fix bug #20045.
|
2022-02-25 10:44:53 +08:00 |
|
|
王怡栋
|
cea8238b79
|
Merge branch 'sgm_upgrade' into 'sprint/185'
* Add pro version.
See merge request easycorp/zentaopms!1977
|
2022-02-25 02:34:05 +00:00 |
|
|
孙广明
|
583550ecb2
|
* Add pro version.
|
2022-02-25 10:31:39 +08:00 |
|
|
王怡栋
|
a0e8f5fcb0
|
Merge branch 'sprint/185_lanzongjun_49334' into 'sprint/185'
* move to extension
See merge request easycorp/zentaopms!1975
|
2022-02-25 02:22:09 +00:00 |
|
|
Zongjun Lan
|
6426e24f95
|
* remove space
|
2022-02-25 10:20:39 +08:00 |
|
|
王怡栋
|
137ca6633a
|
Merge branch 'sprint/185_lwr_xuanurl' into 'sprint/185'
* fix xuan web url, use index.html.
See merge request easycorp/zentaopms!1976
|
2022-02-25 02:19:49 +00:00 |
|
|
王怡栋
|
e6d1cdb4e3
|
Merge branch 'sprint/185_lanzongjun_49340' into 'sprint/185'
* fix task 49340
See merge request easycorp/zentaopms!1974
|
2022-02-25 02:16:45 +00:00 |
|
|
Wenrui LI
|
5e956fadda
|
* fix xuan web url, use index.html.
|
2022-02-25 10:16:43 +08:00 |
|
|
王怡栋
|
daf275c9f9
|
Merge branch 'sgm_upgrade' into 'sprint/185'
* Fix upgrade.
See merge request easycorp/zentaopms!1973
|
2022-02-25 02:16:05 +00:00 |
|
|
Zongjun Lan
|
3d24613524
|
* move to extension
|
2022-02-25 10:01:16 +08:00 |
|
|
Zongjun Lan
|
f6b041635e
|
* fix task 49340
|
2022-02-25 09:47:25 +08:00 |
|
|
孙广明
|
fd9e6fb79d
|
* Fix upgrade.
|
2022-02-25 09:28:16 +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 |
|
|
孙华伟
|
e7920e73b4
|
*
|
2022-02-25 08:38:25 +08: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 |
|