Commit Graph
247 Commits
Author SHA1 Message Date
李玉春 db897d851d Merge branch 'devops_16765' into 'master'
* Fix bug#16765,16771

See merge request easycorp/zentaopms!746
2021-12-02 07:41:47 +00:00
liyuchun da73e10709 * Fix bug #16856. 2021-12-02 15:32:27 +08:00
zenggang a48f584ca8 * Fix bug#16765,16771 2021-12-02 07:14:31 +00:00
liyuchun c943151157 * Fix bug #16847. 2021-12-02 14:28:50 +08:00
liyuchun 71d27fc151 * Fix error. 2021-12-01 17:23:44 +08:00
liyuchun f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
liyuchun 38038eb3ad * Fix bug #16956. 2021-12-01 15:12:44 +08:00
liyuchun 1af877e1e1 * Fix bug #16954. 2021-12-01 14:03:47 +08:00
zenggang 342d52f1e5 * Adjust mr create js code 2021-12-01 05:56:55 +00:00
zenggang 9a5c01de3f * Fix bug#16851 2021-12-01 05:18:45 +00:00
zenggang a69162e260 * Fix bug#16777 2021-12-01 05:12:40 +00:00
zenggang e3c4741d1b * Fix bug#16766 2021-12-01 02:47:39 +00:00
liyuchun e9baf564e7 * Fix bug #16852. 2021-12-01 10:43:13 +08:00
zenggang 2e36226f17 * Fix bug#16947 2021-11-30 09:26:24 +00:00
zenggang 5d192a8413 * Fix bug#16764 2021-11-30 06:37:17 +00:00
zenggang 880374b21b * Fix bug#16746 2021-11-30 06:25:41 +00:00
zenggang 354203e7c9 * Fix bug#16857 2021-11-30 06:14:53 +00:00
zenggang 6dc4aeb458 * Fix bug#16774 2021-11-30 05:59:03 +00:00
liyuchun ac79294f8d * Fix bug #16920. 2021-11-30 13:36:37 +08:00
liyuchun 570b5c1cdb Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-30 12:03:29 +08:00
zenggang 5bb1d7b671 * Fix bug#16860 2021-11-30 03:08:33 +00:00
liyuchun cabe7d0062 * Fix bug #16922. 2021-11-30 11:00:47 +08:00
zenggang 67a17333a4 * Fix bug#16849 2021-11-30 02:40:59 +00:00
zenggang 5bbcd0bc35 * Fix bug#16849 2021-11-30 02:12:59 +00:00
zenggang 83724a370d * Fix bug#16910,16850 2021-11-30 01:40:07 +00:00
liyuchun de202d29a8 Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-30 09:29:53 +08:00
liyuchun 4906d6f51a * Fix bug #16759. 2021-11-30 09:29:35 +08:00
zenggang 404a567b73 * Fix bug#16818 2021-11-30 00:53:46 +00:00
zenggang 1b6059c5b3 * Fix bug#16858 2021-11-29 08:41:24 +00:00
zenggang 32c10ef830 * Fix bug#16756 2021-11-29 06:21:46 +00:00
zenggang 81108390d1 * Fix bug#16761 2021-11-29 05:45:29 +00:00
zenggang 24513b3472 * Fix bug#16769 2021-11-29 03:34:22 +00:00
zenggang f837e6af2c * Fix bug#16762 2021-11-29 02:37:38 +00:00
zenggang b70703eb34 * Fix bug#16762 2021-11-29 02:33:53 +00:00
zenggang b0e125a4ad * Fix bug#16763 2021-11-29 02:27:03 +00:00
liyuchun 2b52af1ba4 Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-29 09:48:31 +08:00
liyuchun ea87d0d644 * Fix bug #16760. 2021-11-29 09:48:20 +08:00
zenggang a2d0cdb04e * Fix bug#16762 2021-11-29 00:57:31 +00:00
zenggang 6bfdcd4e40 * Adjust mr create logic 2021-11-26 08:12:46 +00:00
zenggang 0b965aa699 * Fix bug#16745 2021-11-26 07:17:55 +00:00
xiawenlong 59b7c221ba Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-26 11:15:11 +08:00
xiawenlong 02d0050f3f * Fix edit js bug. 2021-11-26 11:15:09 +08:00
zenggang 49f65eaae8 * Fix bug#16755 2021-11-26 03:14:51 +00:00
xiawenlong 14ef9fa0de * Fix create js bug. 2021-11-26 11:10:53 +08:00
liyuchun 0479696334 * Finish task #44798. 2021-11-25 17:23:46 +08:00
zenggang 9b13921ed4 * Adjust code 2021-11-24 06:13:04 +00:00
Guan Xiying ba8ae82bbc * Fix links in tab nav of mr view page. 2021-11-24 11:27:32 +08:00
Guan Xiying 32a0795e8e * Adjust style of view mr page. 2021-11-24 09:48:20 +08:00
Guan Xiying 1f2fa3e96d * Adjust style of mr view. 2021-11-23 20:16:59 +08:00
dingguodong 08c61e75ed * Adjust the page of view for MR module. 2021-11-23 20:15:01 +08:00