Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,759 Commits 2 Branches 292 Tags
67a17333a47e43228fbdcf200dd1f0ab9cc14258
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
liyuchun 2098270105 Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-30 10:18:38 +08:00
liyuchun b80d0643ac * Add field of zt_mr. 2021-11-30 10:18:24 +08: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
liyuchun 3fcab63bb9 Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-29 17:02:14 +08:00
liyuchun 6200b6dc58 * Fix bug #16719. 2021-11-29 16:57:21 +08:00
liyuchun 1e5db8c6db * Finish task #44798. 2021-11-29 13:30:33 +08: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
liyuchun ad5dfa073c * Fix bug #16845. 2021-11-29 08:39:32 +08:00
liyuchun f451a1c23e Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-26 16:03:23 +08:00
liyuchun 5b76958a3b * Fix bug #16719. 2021-11-26 15:57:31 +08:00
liyuchun 0479696334 * Finish task #44798. 2021-11-25 17:23:46 +08:00
liyuchun facb6f1ce4 * Fix bug #16715. 2021-11-25 15:59:54 +08:00
liyuchun e80d9acf37 * Finish task #44796. 2021-11-25 14:51:11 +08:00
liyuchun fd3a7312dc Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon 2021-11-25 14:14:37 +08:00
liyuchun 2aec31c5e0 * Finish task #44802. 2021-11-25 14:13:23 +08:00
liyuchun ef9ad2c0d7 * Finish task #44802. 2021-11-25 13:49:04 +08:00
liyuchun 00d1e992f6 * Fix bug #44799. 2021-11-25 09:47:07 +08:00
liyuchun 886f54508f * Adjust style of api index. 2021-10-28 15:10:23 +08:00
liyuchun 28a87df599 * Fix bug #15164. 2021-10-22 11:11:10 +08:00
liyuchun d92c073cb5 * Fix bug #15684. 2021-10-20 17:08:53 +08:00
liyuchun 5eb305f393 * Fix bug #15684. 2021-10-20 16:40:47 +08:00
liyuchun fce0f3aafa * Fix bug #15592. 2021-10-20 16:04:44 +08:00
liyuchun 3f279a9ec1 * Fix bug #15674. 2021-10-20 15:00:11 +08:00
liyuchun 2fb6e09218 * Fix bug #15663. 2021-10-20 11:18:10 +08:00
liyuchun a2163a67d0 * Add auth of api. 2021-10-19 20:37:36 +08:00
liyuchun 9e83958e1c * Adjust order of change log. 2021-10-19 20:34:59 +08:00
liyuchun b32541f20f * Fix bug #15639. 2021-10-19 20:32:06 +08:00
liyuchun 8c12096a92 * Fix bug #15639. 2021-10-19 20:23:19 +08:00
liyuchun a2b3fe0ff1 * Fix bug #15636. 2021-10-19 19:17:15 +08:00
liyuchun fe9e1ac81e Merge branch 'sprint/167_xieqiyu_15615' into sprint/167 2021-10-19 18:45:56 +08:00
liyuchun 6eefec7f8c * Fix bug #15585. 2021-10-19 17:20:31 +08:00
liyuchun 350285bbd0 * Adjust cases of testcase. 2021-10-19 15:36:01 +08:00
liyuchun a2afa49845 * Add cases of testcase. 2021-10-19 15:06:01 +08:00
liyuchun c7e3f11892 * Fix bug #15541. 2021-10-18 11:27:01 +08:00
liyuchun 672598aada * Fix bug #15541. 2021-10-18 10:39:15 +08:00
liyuchun fac2119507 * Fix bug #15541. 2021-10-18 10:28:47 +08:00
liyuchun c8fe1f5e14 * Fix bug #15541. 2021-10-18 10:21:08 +08:00
liyuchun e3291b0e2a * Fix bug #15541. 2021-10-18 09:07:11 +08:00
liyuchun cfdce3652f * Finish task #43187. 2021-10-14 13:51:47 +08:00
liyuchun 6e94ad01de Merge branch '15.6' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.6 2021-10-14 10:06:25 +08:00
liyuchun 01e57a1c57 * Fix bug #15514. 2021-10-14 10:05:53 +08:00
liyuchun 756576f2e4 * Finish task #43205. 2021-10-14 09:00:36 +08:00
liyuchun 2330adc576 * Adjsut update user view error. 2021-10-13 17:16:53 +08:00
liyuchun 6359266cf9 * Adjust logic of update whitelist when update user view. 2021-10-13 16:37:24 +08:00
liyuchun 9f36655aea * Finish task #43205. 2021-10-13 15:29:53 +08:00
liyuchun 5cd7ed9d74 * Fix bug #15495. 2021-10-13 14:35:09 +08:00
liyuchun 3ddba6aeeb * Fix bug #15479. 2021-10-13 10:17:53 +08:00
liyuchun 753c31e84c * Finish task #43205. 2021-10-12 10:09:49 +08:00
liyuchun a588e38cbc * Finish task #43178. 2021-10-11 14:58:22 +08:00
liyuchun cf687f3ee5 * Adjust of zt_dept. 2021-10-11 08:51:56 +08:00
liyuchun 5945717a55 * Fix bug #42859. 2021-10-09 15:22:57 +08:00
liyuchun bd4475e142 * Adjsut zendata file of usergroup. 2021-09-30 14:46:15 +08:00
liyuchun 10762bf780 * Add zendata files. 2021-09-30 13:40:22 +08:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
liyuchun 7dfa0963e6 * Finish task #42860. 2021-09-26 16:23:20 +08:00
liyuchun 36a6d9f4e3 * Finish task #42834. 2021-09-26 14:43:28 +08:00
liyuchun 3966f808a3 * Fix bug #15242. 2021-09-18 15:40:17 +08:00
liyuchun e4ab2d8a80 * Fix bug #15245. 2021-09-18 11:19:12 +08:00
liyuchun f182feb33c * Fix bug #15183. 2021-09-18 08:37:12 +08:00
liyuchun 33e946e968 * Fix bug #15183. 2021-09-18 08:33:58 +08:00
liyuchun 3c7139840f Merge branch '15.5' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 15:21:44 +08:00
liyuchun 9c2cd403d7 * Fix bug #14558. 2021-09-15 15:08:47 +08:00
liyuchun 4c0319296c * Fix bug #15183. 2021-09-15 13:58:52 +08:00
liyuchun 96dac5453a * Fix bug #15184. 2021-09-15 09:16:11 +08:00
liyuchun 77cab3ad10 * Fix bug #15184. 2021-09-15 09:14:16 +08:00
liyuchun 723e921b6e * Fix bug #15169. 2021-09-15 08:36:18 +08:00
liyuchun b7696df6ce * Update skip guide key. 2021-09-14 15:48:07 +08:00
liyuchun 3302a7bedb * Code for task #41764. 2021-09-14 15:10:15 +08:00
liyuchun 358ab9fcb4 Merge branch '15.5' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-14 15:09:24 +08:00
liyuchun 825184e665 * Adjust new feature style. 2021-09-14 15:08:38 +08:00
liyuchun 48254bab16 * Code for task #41764. 2021-09-14 15:02:34 +08:00
liyuchun ac0dda63e5 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 15:01:10 +08:00
liyuchun 605ee502be * Adjust new feature style. 2021-09-14 14:25:56 +08:00
liyuchun 05f8e92c08 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-14 11:29:52 +08:00
liyuchun 96fd75142f * Code for task #41764. 2021-09-14 11:20:00 +08:00
liyuchun 59ef172f9c * Fix bug #14682. 2021-09-14 10:22:40 +08:00
liyuchun a22c3ba71f * Adjust access permission of create doc. 2021-09-14 09:48:12 +08:00
liyuchun 6748622c62 * Change image of young blue theme. 2021-09-14 09:16:06 +08:00
liyuchun 8e2eae4f05 * Fix bug #14697. 2021-09-14 08:59:24 +08:00
liyuchun 33e1839583 * Fix bug #15121. 2021-09-13 15:01:40 +08:00
liyuchun ebad305ad8 * Fix bug #14747. 2021-09-13 15:34:17 +08:00
liyuchun 3e59e58fdb Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-13 11:17:48 +08:00
liyuchun 0a8d494e8c * Fix bug #15113. 2021-09-13 11:16:32 +08:00
liyuchun 4e3933ddad * Fix bug #15106. 2021-09-13 11:08:23 +08:00
liyuchun 553c797c67 * Fix get products error. 2021-09-10 09:34:19 +08:00
liyuchun 974633de86 * Finish task #42143. 2021-09-09 19:44:03 +08:00
liyuchun fa2e8cd1b0 * Fix bug #15004. 2021-09-09 14:43:41 +08:00
liyuchun 2c0ea271c2 * Fix bug #14361. 2021-09-09 10:47:32 +08:00
liyuchun 1b8e9f4a71 * Finish task #42377. 2021-09-09 10:06:16 +08:00
liyuchun 2f776b61a1 * Finish task #42379. 2021-09-09 09:06:18 +08:00
liyuchun 831b78e6db * Finish task #42380. 2021-09-09 09:02:43 +08:00
liyuchun 9f5377c865 * Finish task #42384. 2021-09-09 08:50:07 +08:00
liyuchun 797b4c2167 * Finish task #42399. 2021-09-08 16:58:51 +08:00
liyuchun 69c1b44157 * Fix bug #15061. 2021-09-08 16:53:55 +08:00
liyuchun 2f4caca4cd * Finish task #42404. 2021-09-08 16:46:20 +08:00
liyuchun 48a03ff80d * Fix bug #14953. 2021-09-08 16:44:30 +08:00
liyuchun a03a74fd5b * Fix bug #15004. 2021-09-08 16:01:41 +08:00
liyuchun 21b5e77382 * Fix bug #15004. 2021-09-08 15:52:00 +08:00