 孙广明
|
b309300da4
|
Merge branch 'mayue_fix_bug#18065' into 'master'
* Fix bug#18065.
See merge request easycorp/zentaopms!2886
|
2022-04-12 07:58:45 +00:00 |
|
|
朱金勇
|
e1eb543ed7
|
Merge branch 'app_zry' into 'master'
App zry
See merge request easycorp/zentaopms!2872
|
2022-04-12 07:28:24 +00:00 |
|
|
mayue
|
4aaefa9fb7
|
* Fix bug #18065.
|
2022-04-12 15:24:47 +08:00 |
|
|
zhengrunyu
|
9cb5cb1134
|
* Add api for resolve bug.
|
2022-04-12 14:40:48 +08:00 |
|
|
mayue
|
cedd0270e2
|
* Optimize code.
|
2022-04-12 14:14:32 +08:00 |
|
|
mayue
|
3f9feedfe7
|
* Fix bug #18065.
|
2022-04-12 14:12:03 +08:00 |
|
|
tianshujie
|
f2aa066bdc
|
* Fix bug #19261.
|
2022-04-11 13:19:18 +08:00 |
|
|
孙广明
|
af9545b817
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.
See merge request easycorp/zentaopms!2756
|
2022-04-07 07:57:51 +00:00 |
|
|
tanghucheng
|
3d3ffe9348
|
* Fix bug #21403,21474,21410,21414,21417,21456.
|
2022-04-07 15:27:54 +08:00 |
|
|
孙广明
|
170393a33a
|
Merge branch 'master_xieqiyu_20278' into 'master'
* Fix bug#20278.
See merge request easycorp/zentaopms!2774
|
2022-04-06 09:07:45 +00:00 |
|
|
孙广明
|
650ea1a463
|
Merge branch 'master_xieqiyu_21290' into 'master'
* Fix bug#21290.
See merge request easycorp/zentaopms!2765
|
2022-04-06 09:06:57 +00:00 |
|
|
xieqiyu
|
09fa1197f6
|
* Fix bug#20278.
|
2022-04-06 16:59:00 +08:00 |
|
|
zenggang
|
8799957c73
|
* Fix bug#21218
|
2022-04-06 08:00:21 +00:00 |
|
|
xieqiyu
|
d8774117b9
|
* Fix bug#21290.
|
2022-04-06 15:36:20 +08:00 |
|
|
孙华伟
|
1612f6aabd
|
Optimize the code.
|
2022-04-02 17:08:34 +08:00 |
|
|
孙华伟
|
c6327139bc
|
Optimize the code.
|
2022-04-02 01:32:33 +00:00 |
|
|
孙华伟
|
a58fc45e20
|
Optimize the code.
|
2022-04-02 08:47:38 +08:00 |
|
|
孙华伟
|
41f03ea9ce
|
*Fix bug#20336.
|
2022-04-01 10:09:44 +08:00 |
|
|
mayue
|
b15719692d
|
* Optimize code.
|
2022-04-01 08:36:46 +08:00 |
|
|
mayue
|
f120ed912a
|
* Fix bug #21345.
|
2022-03-31 16:40:47 +08:00 |
|
|
xieqiyu
|
2ed1eedfcf
|
* Fix bug#19273.
|
2022-03-31 13:42:28 +08:00 |
|
|
zhujinyong
|
a91d090845
|
+ Add options api.
|
2022-03-30 17:08:03 +08:00 |
|
|
zenggang
|
5ceeb72655
|
* Finish task#51117
|
2022-03-30 02:43:34 +00:00 |
|
|
孙广明
|
0fe342e621
|
Merge branch 'master_xieqiyu_16137' into 'master'
* Fix bug#16137,#16136.
See merge request easycorp/zentaopms!2604
|
2022-03-29 05:26:06 +00:00 |
|
|
xieqiyu
|
731f96d1a5
|
* Fix bug#16137,#16136.
|
2022-03-29 10:57:12 +08:00 |
|
|
朱金勇
|
fe3cbd34d1
|
Merge branch 'app_zhengrunyu' into 'master'
* Add api for close bug and confirm bug.
See merge request easycorp/zentaopms!2599
|
2022-03-29 01:48:20 +00:00 |
|
|
zhengrunyu
|
4c5be242cd
|
* Add api for close bug and confirm bug.
|
2022-03-29 09:41:17 +08:00 |
|
|
孙广明
|
0aa0f12057
|
Merge branch 'master_xieqiyu_20875' into 'master'
* Fix bug#20875.
See merge request easycorp/zentaopms!2564
|
2022-03-28 06:37:08 +00:00 |
|
|
xieqiyu
|
f72da77a5d
|
* Code for bug#20875.
|
2022-03-28 13:52:42 +08:00 |
|
|
李玉春
|
c6e89fc7c1
|
Merge branch 'fixbug_cyy' into 'master'
* Fix bug #20156.
See merge request easycorp/zentaopms!2570
|
2022-03-28 03:16:18 +00:00 |
|
|
caoyanyi
|
99ad50eb3e
|
* Fix bug #20156.
|
2022-03-28 10:53:03 +08:00 |
|
|
xieqiyu
|
f500822991
|
* Fix bug#20875.
|
2022-03-28 10:11:39 +08:00 |
|
|
孙广明
|
8acea5b35c
|
Merge branch 'master_xieqiyu_20878' into 'master'
* Fix bug#20878.
See merge request easycorp/zentaopms!2547
|
2022-03-25 06:59:00 +00:00 |
|
|
xieqiyu
|
39123bd4d9
|
* Fix bug#20878.
|
2022-03-25 14:15:30 +08:00 |
|
|
Hao Sun
|
b818f4054a
|
* bug #11279, fix hotkey up/down with datetimepicker not work in batch action page.
|
2022-03-25 13:13:29 +08:00 |
|
|
zenggang
|
1357480ac6
|
* Finish task#51109,51108,51128
|
2022-03-23 07:54:03 +00:00 |
|
|
孙广明
|
a2a191b421
|
Merge branch 'liyuchun_bug_17235'
|
2022-03-22 15:45:41 +08:00 |
|
|
孙广明
|
41eee3ddd4
|
Merge branch 'master' into 'liyuchun_bug_17235'
# Conflicts:
# module/common/model.php
|
2022-03-22 07:43:58 +00:00 |
|
|
zenggang
|
784e153159
|
* Finish task#51115,51116,51120,51121,51133
|
2022-03-22 07:11:57 +00:00 |
|
|
liyuchun
|
166cda1186
|
* Fix bug #17235.
|
2022-03-22 14:12:44 +08:00 |
|
|
李玉春
|
2b1fee6181
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2433
|
2022-03-22 05:43:55 +00:00 |
|
|
tianshujie
|
129c55db39
|
* Delete useless judgment conditions.
|
2022-03-22 13:40:43 +08:00 |
|
|
tianshujie
|
1004f727ae
|
* Modify language item.
|
2022-03-22 12:35:34 +08:00 |
|
|
xieqiyu
|
e2fbaa6828
|
* Fix bug#20396.
|
2022-03-22 11:10:44 +08:00 |
|
|
tianshujie
|
8cf4b3bcae
|
* Fix bug #19261.
|
2022-03-22 11:01:14 +08:00 |
|
|
xieqiyu
|
f1aa12aae3
|
* Fix bug.
|
2022-03-22 09:36:32 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
xieqiyu
|
0d21516997
|
* Modify create bug.
|
2022-03-22 08:40:43 +08:00 |
|
|
liyuchun
|
0187fb80c7
|
Merge branch 'devops24'
|
2022-03-22 08:28:32 +08:00 |
|
|
孙广明
|
73e6d617ef
|
Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Modify code.
See merge request easycorp/zentaopms!2383
|
2022-03-21 00:29:00 +00:00 |
|