 liumengyi
|
69eb942fa4
|
* Fix bug #25988.
|
2022-08-03 16:13:59 +08:00 |
|
|
王怡栋
|
b9ba15e223
|
Merge branch 'sprint/221_25897' into 'master'
* Fix bug#25897,22882
See merge request easycorp/zentaopms!4763
|
2022-08-03 07:52:50 +00:00 |
|
|
王怡栋
|
77e01714d2
|
Merge branch 'sprint/211_liumengyi_62958' into 'master'
* Finish task #62957, #62958.
See merge request easycorp/zentaopms!4760
|
2022-08-03 07:46:59 +00:00 |
|
|
zenggang
|
3a9f4d8ada
|
* Fix bug#25897,22882
|
2022-08-03 07:16:28 +00:00 |
|
|
李玉春
|
ed719f768f
|
Merge branch 'sprint/221_tianshujie_62947' into 'master'
Sprint/221 tianshujie 62947
See merge request easycorp/zentaopms!4761
|
2022-08-03 06:52:24 +00:00 |
|
|
李玉春
|
e8e657e6bb
|
Update model.php
|
2022-08-03 06:52:05 +00:00 |
|
|
tianshujie
|
b4a394718f
|
* Finish task #62947.
|
2022-08-03 14:49:42 +08:00 |
|
|
tianshujie
|
6661f80c81
|
* Fix bug #25984.
|
2022-08-03 14:19:00 +08:00 |
|
|
liumengyi
|
2c108bcf16
|
* Fix bug #25987.
|
2022-08-03 14:06:17 +08:00 |
|
|
李玉春
|
d9d807c79d
|
Merge branch 'sprint/221_liumengyi_25965' into 'master'
* Fix bug #25965.
See merge request easycorp/zentaopms!4756
|
2022-08-03 05:43:46 +00:00 |
|
|
李玉春
|
b7e845f6b5
|
Merge branch 'sprint/221_liumengyi_25964' into 'master'
* Fix bug #25964.
See merge request easycorp/zentaopms!4757
|
2022-08-03 05:43:20 +00:00 |
|
|
李玉春
|
9ec11b0fd8
|
Merge branch 'sprint/211_liumengyi_25978' into 'master'
* Fix bug #25978.
See merge request easycorp/zentaopms!4758
|
2022-08-03 05:42:30 +00:00 |
|
|
李玉春
|
0083ac3f07
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #25968.
See merge request easycorp/zentaopms!4755
|
2022-08-03 05:42:19 +00:00 |
|
|
tianshujie
|
167c36d6d5
|
* Finish task #62947.
|
2022-08-03 13:41:05 +08:00 |
|
|
liumengyi
|
1247155cc1
|
* Fix bug #25978.
|
2022-08-03 13:27:05 +08:00 |
|
|
liumengyi
|
fc60a3f503
|
* Fix bug #25964.
|
2022-08-03 13:16:42 +08:00 |
|
|
liumengyi
|
66990b3fc9
|
* Fix bug #25965.
|
2022-08-03 13:14:45 +08:00 |
|
|
liumengyi
|
56c6349d0d
|
* Fix bug #25967.
|
2022-08-03 13:03:11 +08:00 |
|
|
liumengyi
|
8c1c84b430
|
* Fix bug #25968.
|
2022-08-03 11:24:36 +08:00 |
|
|
liumengyi
|
2ab2e3a2fb
|
* Finish task #62958.
|
2022-08-03 11:18:14 +08:00 |
|
|
liumengyi
|
9238ad1965
|
* Finish task #62957.
|
2022-08-03 11:17:49 +08:00 |
|
|
wangyidong
|
6a6218bc41
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-03 10:36:00 +08:00 |
|
|
wangyidong
|
ebe6dd630f
|
* fix bug #25921.
|
2022-08-03 10:35:41 +08:00 |
|
|
王怡栋
|
1c54132793
|
Merge branch 'master_liuhong_24281' into 'master'
Master liuhong 24281
See merge request easycorp/zentaopms!4752
|
2022-08-03 02:13:32 +00:00 |
|
|
王怡栋
|
1d59e34b07
|
Merge branch 'sprint/221_zg' into 'master'
Sprint/221 zg
See merge request easycorp/zentaopms!4751
|
2022-08-03 02:12:38 +00:00 |
|
|
liuhong
|
1e6366945d
|
*Fix bug #24281
|
2022-08-03 01:44:41 +00:00 |
|
|
zenggang
|
bc8dfbbe7a
|
* Adjust code
|
2022-08-03 01:43:58 +00:00 |
|
|
liuhong
|
abcbe76d24
|
*Fix bug 24281
|
2022-08-03 01:40:55 +00:00 |
|
|
王怡栋
|
8675278f16
|
Merge branch 'master' into 'sprint/221_tianshujie_62940'
# Conflicts:
# db/update17.4.sql
|
2022-08-03 01:35:27 +00:00 |
|
|
tianshujie
|
aa30d43e68
|
* Finish task #62940.
|
2022-08-03 09:34:11 +08:00 |
|
|
tianshujie
|
947c380443
|
* Finish task #62940.
|
2022-08-03 09:25:53 +08:00 |
|
|
王怡栋
|
718b6543fc
|
Merge branch 'sprint/221_liumengyi_62945' into 'master'
* Finish task #62945.
See merge request easycorp/zentaopms!4750
|
2022-08-03 01:22:02 +00:00 |
|
|
王怡栋
|
515143259b
|
Merge branch 'sprint/221_liumengyi_62949' into 'master'
* Optimize code for task #62949.
See merge request easycorp/zentaopms!4749
|
2022-08-03 01:21:23 +00:00 |
|
|
王怡栋
|
9bb4369d7b
|
Merge branch 'sprint/221_liumengyi_62935' into 'master'
* Finish task #62935.
See merge request easycorp/zentaopms!4748
|
2022-08-03 01:21:03 +00:00 |
|
|
liumengyi
|
1da72a9ac7
|
* Fix bug for task #62945.
|
2022-08-03 09:07:27 +08:00 |
|
|
liumengyi
|
08ffbda087
|
* Optimize code for task #62949.
|
2022-08-03 09:03:19 +08:00 |
|
|
zenggang
|
e3698f1b6a
|
* Adjust code
|
2022-08-03 00:48:59 +00:00 |
|
|
liumengyi
|
6d019f65e5
|
* Fix bug for task #62935.
|
2022-08-03 08:39:25 +08:00 |
|
|
tianshujie
|
9300ddb0ed
|
* Finish task #62940.
|
2022-08-03 08:29:41 +08:00 |
|
|
zenggang
|
d9e251ea26
|
* Fix bug#25416
|
2022-08-02 09:29:33 +00:00 |
|
|
王怡栋
|
902fe36227
|
Merge branch 'sprint/221_liumengyi_62949' into 'master'
* Finish task #62949.
See merge request easycorp/zentaopms!4745
|
2022-08-02 09:25:15 +00:00 |
|
|
王怡栋
|
62f02d288c
|
Merge branch 'sprint/221_liumengyi_62939' into 'master'
* Finish task #62939.
See merge request easycorp/zentaopms!4744
|
2022-08-02 09:24:21 +00:00 |
|
|
王怡栋
|
1a13bf3fb0
|
Merge branch 'sprint/221_liumengyi_62938' into 'master'
* Finish task #62938.
See merge request easycorp/zentaopms!4743
|
2022-08-02 09:24:01 +00:00 |
|
|
tianshujie
|
3fdfc473c6
|
* Finish task #62941.
|
2022-08-02 17:23:35 +08:00 |
|
|
王怡栋
|
62038c368a
|
Merge branch 'sprint/221_liumengyi_62944' into 'master'
* Finish task #62944.
See merge request easycorp/zentaopms!4742
|
2022-08-02 09:21:11 +00:00 |
|
|
王怡栋
|
42f9f1d561
|
Merge branch 'fixbug' into 'master'
* Code for action.
See merge request easycorp/zentaopms!4734
|
2022-08-02 08:20:58 +00:00 |
|
|
王怡栋
|
6cc611635c
|
Merge branch 'sprint/221' into 'master'
Sprint/221
See merge request easycorp/zentaopms!4740
|
2022-08-02 08:20:39 +00:00 |
|
|
zenggang
|
8f6ca19bf7
|
* Finish task#62937,62950
|
2022-08-02 08:19:56 +00:00 |
|
|
wangyidong
|
99c5aab19a
|
* code for task #62739.
|
2022-08-02 16:18:38 +08:00 |
|
|
liumengyi
|
7c8df39c3c
|
* Finish task #62949.
|
2022-08-02 16:08:10 +08:00 |
|