 tanghucheng
|
d32f3d2664
|
* Fix bug #19820,20528.
|
2022-03-14 14:51:03 +08:00 |
|
|
tanghucheng
|
a25fd822bd
|
* Fix bug #20702,20698,20642.
|
2022-03-14 09:55:44 +08:00 |
|
|
tanghucheng
|
fb78d74984
|
* Fix bug.
|
2022-03-11 15:48:25 +08:00 |
|
|
tanghucheng
|
c81a8d5edf
|
* Fix bug.
|
2022-03-11 15:21:29 +08:00 |
|
|
tanghucheng
|
cd84fb4d54
|
* Fix bug.
|
2022-03-11 15:09:17 +08:00 |
|
|
tanghucheng
|
477e89a09e
|
* Fix bug.
|
2022-03-11 14:03:30 +08:00 |
|
|
朱金勇
|
148f093d38
|
Merge branch 'sgm_upgrade' into 'master'
* Code for upgrade bug.
See merge request easycorp/zentaopms!2194
|
2022-03-11 01:20:40 +00:00 |
|
|
孙广明
|
68ae0eb009
|
* Code for upgrade bug.
|
2022-03-11 09:17:35 +08:00 |
|
|
tianshujie
|
af5a97ad40
|
* Fix bug #20591.
|
2022-03-11 08:34:54 +08:00 |
|
|
王怡栋
|
185ae2a4f8
|
* fix bug #20560.
|
2022-03-10 17:23:50 +08:00 |
|
|
zhujinyong
|
f32ff3980b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 16:22:58 +08:00 |
|
|
zhujinyong
|
819fad539e
|
* Finish story#31282, story#31284.
|
2022-03-10 16:21:27 +08:00 |
|
|
tanghucheng
|
6e0066af25
|
* Merge code.
|
2022-03-10 16:19:26 +08:00 |
|
|
孙广明
|
97859c945b
|
Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
# module/user/js/batchcreate.js
# module/user/view/batchcreate.html.php
|
2022-03-10 08:07:31 +00:00 |
|
|
tanghucheng
|
dc394cd674
|
* Fix code format.
|
2022-03-10 15:31:50 +08:00 |
|
|
tanghucheng
|
31588aacc7
|
* Adjust for batchcreate user.
|
2022-03-10 15:23:40 +08:00 |
|
|
tianshujie
|
7e89329205
|
* Fix bug #20546.
|
2022-03-10 15:09:54 +08:00 |
|
|
朱金勇
|
6efc1fad24
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade error.
See merge request easycorp/zentaopms!2185
|
2022-03-10 06:21:24 +00:00 |
|
|
sgm0422
|
ca5624db56
|
* Fix upgrade error.
|
2022-03-10 14:16:48 +08:00 |
|
|
tanghucheng
|
76fd14c845
|
* Adjust for create user.
|
2022-03-10 12:09:33 +08:00 |
|
|
孙广明
|
86bc5e14ea
|
Merge branch 'sprint/187_hufangzhou_mySetMenu' into 'master'
* Remove the unused code.
See merge request easycorp/zentaopms!2180
|
2022-03-10 03:19:27 +00:00 |
|
|
tianshujie
|
11d4052d8e
|
* Fix bug #15980.
|
2022-03-10 11:15:16 +08:00 |
|
|
hufangzhou
|
57bbeeddd7
|
* Remove the unused code.
|
2022-03-10 11:01:21 +08:00 |
|
|
sgm0422
|
479a6f5575
|
* Add pro upgrade to biz.
|
2022-03-10 10:42:29 +08:00 |
|
|
孙广明
|
cc0ae84104
|
Merge branch 'master_xieqiyu_bug#50418' into 'master'
* Fix bug#16424,#20555.
See merge request easycorp/zentaopms!2178
|
2022-03-10 02:37:42 +00:00 |
|
|
王怡栋
|
01f6eb4cc3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 10:36:40 +08:00 |
|
|
xieqiyu
|
e8a7995351
|
* Fix bug#16424,#20555.
|
2022-03-10 10:32:41 +08:00 |
|
|
王怡栋
|
53c2dd44fb
|
* fix bug #20113.
|
2022-03-10 10:31:10 +08:00 |
|
|
朱金勇
|
9fb53de457
|
Merge branch 'sgm_upgrade' into 'master'
Sgm upgrade
See merge request easycorp/zentaopms!2177
|
2022-03-10 02:30:28 +00:00 |
|
|
sgm0422
|
bc8e061128
|
* Fix upgrade error.
|
2022-03-10 10:20:45 +08:00 |
|
|
孙广明
|
dc1b86402a
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
Sprint/187 tianshujie fixbug
See merge request easycorp/zentaopms!2175
|
2022-03-10 02:15:13 +00:00 |
|
|
tianshujie
|
a0e7c613f3
|
* Finish task #50370.
|
2022-03-10 10:11:56 +08:00 |
|
|
tianshujie
|
a7d66c5fae
|
* Fix bug #20572.
|
2022-03-10 10:05:34 +08:00 |
|
|
sgm0422
|
1748b61779
|
* Fix upgrade error.
|
2022-03-10 10:01:08 +08:00 |
|
|
sgm0422
|
b2d61cc993
|
* Fix upgrade bug.
|
2022-03-10 09:45:30 +08:00 |
|
|
tianshujie
|
c7c06be02a
|
* Fix bug #20561.
|
2022-03-10 09:42:35 +08:00 |
|
|
zenggang
|
549ab5e98f
|
* Adjust code
|
2022-03-10 00:53:15 +00:00 |
|
|
zenggang
|
41e2e45e8a
|
* Fix bug#20464
|
2022-03-09 09:27:42 +00:00 |
|
|
tanghucheng
|
b4726315ba
|
* Fix bug.
|
2022-03-09 17:27:01 +08:00 |
|
|
hufangzhou
|
9eb99fed12
|
* Fix bug #20442.
|
2022-03-09 17:13:18 +08:00 |
|
|
李玉春
|
a944fe18f5
|
Merge branch 'sprint/187_tianshujie' into 'master'
Sprint/187 tianshujie
See merge request easycorp/zentaopms!2166
|
2022-03-09 08:25:00 +00:00 |
|
|
zhujinyong
|
1076396a79
|
* Refactor upgrade.
|
2022-03-09 16:20:53 +08:00 |
|
|
tianshujie
|
ffd4850a9d
|
* Finish task #20479.
|
2022-03-09 16:17:32 +08:00 |
|
|
tianshujie
|
1afb4315be
|
* Finish task #50389.
|
2022-03-09 16:06:41 +08:00 |
|
|
tianshujie
|
eab4c059a3
|
* Finish task #50388.
|
2022-03-09 16:02:00 +08:00 |
|
|
tianshujie
|
8cd6a13955
|
* Fix bug #20535.
|
2022-03-09 15:08:17 +08:00 |
|
|
tianshujie
|
b4c0fff8e0
|
* Fix bug #20531.
|
2022-03-09 14:55:04 +08:00 |
|
|
tianshujie
|
a349c5bfeb
|
* Fix bug #20530.
|
2022-03-09 14:01:41 +08:00 |
|
|
孙广明
|
ebfdd2a742
|
Merge branch 'autoTest_liumengyi' into 'master'
* Add auto test for task.
See merge request easycorp/zentaopms!2159
|
2022-03-09 05:53:01 +00:00 |
|
|
liumengyi
|
b1623bb73a
|
* Add auto test for task.
|
2022-03-09 13:46:19 +08:00 |
|