 liuruogu
|
3d64493a75
|
* Fix bug #27665 and hidden product menu.
|
2022-09-21 06:38:47 +00:00 |
|
|
liuruogu
|
e461c66fc0
|
* Fix bug #27604.
|
2022-09-20 07:30:32 +00:00 |
|
|
liuruogu
|
75282f1334
|
* Fix bug #27576.
|
2022-09-20 02:52:54 +00:00 |
|
|
刘刚
|
29fe14994c
|
Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Fix bug #27527.
See merge request easycorp/zentaopms!5404
|
2022-09-19 07:47:47 +00:00 |
|
|
liuruogu
|
a0d2e6517b
|
* Fix bug #27527.
|
2022-09-19 07:37:07 +00:00 |
|
|
liuruogu
|
a54510b47f
|
* Fix bug #27527.
|
2022-09-19 07:31:29 +00:00 |
|
|
liugang
|
24968b1f19
|
* Optimize.
|
2022-09-19 14:45:54 +08:00 |
|
|
刘刚
|
2c85588d1a
|
Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Finish task #69017.
See merge request easycorp/zentaopms!5387
|
2022-09-19 02:02:08 +00:00 |
|
|
tanghucheng
|
30ad85c622
|
* Finish task #69004.
|
2022-09-16 16:11:55 +08:00 |
|
|
liuruogu
|
cfc214c776
|
* Finish task #69017.
|
2022-09-16 07:42:20 +00:00 |
|
|
tanghucheng
|
14dd9807e9
|
* Finish task #69006.
|
2022-09-16 13:13:26 +08:00 |
|
|
孙广明
|
ac994fc477
|
Merge branch 'zentaopms_239' into 'sgm_69027'
# Conflicts:
# db/update17.6.1.sql
|
2022-09-16 00:46:21 +00:00 |
|
|
tanghucheng
|
3d05710c9f
|
Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239_tanghucheng
|
2022-09-15 14:29:52 +08:00 |
|
|
liuruogu
|
8d46cc5019
|
* Do task #69018.
|
2022-09-15 02:01:00 +00:00 |
|
|
sunguangming
|
c1300115e7
|
* Code for task #69026/69027.
|
2022-09-15 09:29:17 +08:00 |
|
|
tanghucheng
|
4eaf187aab
|
* Finish task #69010.
|
2022-09-15 08:58:12 +08:00 |
|
|
xieqiyu
|
4d439f7337
|
* Fix bug#26180.
|
2022-09-09 14:33:29 +08:00 |
|
|
王怡栋
|
ceeda8a41e
|
Merge branch 'master_xieqiyu_67693' into 'master'
* Add delay label.
See merge request easycorp/zentaopms!5277
|
2022-09-07 02:34:47 +00:00 |
|
|
xieqiyu
|
bb38728a54
|
* Add delay label.
|
2022-09-06 16:01:45 +08:00 |
|
|
xieqiyu
|
4f9128b9c1
|
* Fix bug#27288.
|
2022-09-06 15:51:03 +08:00 |
|
|
xieqiyu
|
36dc478de5
|
* Finish task#67693.
|
2022-09-06 10:21:24 +08:00 |
|
|
liumengyi
|
aaa08018f5
|
* Fix bug #23401.
|
2022-09-06 08:30:09 +08:00 |
|
|
liumengyi
|
4274a50e94
|
* Fix bug #27034.
|
2022-09-02 16:25:51 +08:00 |
|
|
王怡栋
|
e1b02d65f8
|
Merge branch 'sprint/235_tianshujie_bug' into 'master'
Sprint/235 tianshujie bug
See merge request easycorp/zentaopms!5238
|
2022-09-01 05:45:30 +00:00 |
|
|
wangyidong
|
e7d65e1dce
|
Merge branch 'sprint/zentaopms230'
|
2022-09-01 13:28:26 +08:00 |
|
|
tianshujie
|
f0ab716d29
|
* Fix bug #25848.
|
2022-09-01 13:22:52 +08:00 |
|
|
hufangzhou
|
a83076d330
|
* Fix bug #26457.
|
2022-09-01 09:47:13 +08:00 |
|
|
孙广明
|
0786961021
|
Merge branch 'sprint/max44_mayue_task#66993' into 'master'
Sprint/max44 mayue task#66993
See merge request easycorp/zentaopms!5202
|
2022-08-31 06:24:59 +00:00 |
|
|
mayue
|
b9efaee057
|
* Optimize code.
|
2022-08-31 13:39:59 +08:00 |
|
|
mayue
|
197e3d6ec4
|
* Fix error tips.
|
2022-08-31 13:16:22 +08:00 |
|
|
hufangzhou
|
61f6b1609f
|
* Fix bug #26586.
|
2022-08-31 11:14:08 +08:00 |
|
|
mayue
|
451bccf572
|
* Optimize regex.
|
2022-08-30 17:09:15 +08:00 |
|
|
mayue
|
b03bdfa09e
|
* Finish task #66993.
|
2022-08-30 16:11:54 +08:00 |
|
|
xieqiyu
|
ea98130180
|
* Fix bug#27010.
|
2022-08-29 15:35:01 +08:00 |
|
|
王怡栋
|
61999b0462
|
Merge branch 'master_xieqiyu_26991' into 'master'
* Fix bug#26991.
See merge request easycorp/zentaopms!5179
|
2022-08-29 05:38:16 +00:00 |
|
|
xieqiyu
|
95b7f73452
|
* Fix bug#26991.
|
2022-08-29 13:20:05 +08:00 |
|
|
wangyidong
|
8d56ef8891
|
* Compatible for php8.1.
|
2022-08-29 11:19:31 +08:00 |
|
|
tianshujie
|
e45c8da5c8
|
* Fix bug #26954.
|
2022-08-26 15:32:33 +08:00 |
|
|
孙广明
|
3fde178457
|
Merge branch 'sprint/231_tianshujie_case' into 'master'
Sprint/231 tianshujie case
See merge request easycorp/zentaopms!5151
|
2022-08-26 07:12:18 +00:00 |
|
|
tianshujie
|
db4a18e3bd
|
* Methods to optimize execution modules.
|
2022-08-26 15:10:31 +08:00 |
|
|
liumengyi
|
3da9fdd18c
|
* Fix bug #26916.
|
2022-08-26 09:49:54 +08:00 |
|
|
tianshujie
|
db036c9172
|
* Fix bug #26879.
|
2022-08-25 15:31:31 +08:00 |
|
|
tianshujie
|
ad240eab61
|
* Fix bug #26889.
|
2022-08-25 15:28:47 +08:00 |
|
|
李玉春
|
9acdb61b77
|
Merge branch 'cyy_api' into 'master'
* Modify api param and app error.
See merge request easycorp/zentaopms!5107
|
2022-08-25 05:53:31 +00:00 |
|
|
caoyanyi
|
d764b13971
|
* Modify api param and app error.
|
2022-08-25 10:08:36 +08:00 |
|
|
sunguangming
|
f49d83f024
|
Merge branch '230' into sprint/zentaopms230
|
2022-08-25 09:59:07 +08:00 |
|
|
王怡栋
|
1092812a40
|
Merge branch 'master_liuhong_26725' into 'master'
*Fix bug #26725.
See merge request easycorp/zentaopms!5049
|
2022-08-25 01:05:32 +00:00 |
|
|
王怡栋
|
297a416762
|
Merge branch 'master' into 'sprint/231_zg_65782'
# Conflicts:
# module/story/control.php
|
2022-08-25 00:51:00 +00:00 |
|
|
王怡栋
|
638be2116b
|
Merge branch 'spritn/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!5065
|
2022-08-25 00:46:17 +00:00 |
|
|
wangyidong
|
676c252581
|
* fix bug for print execution.
|
2022-08-24 14:16:51 +08:00 |
|