 tanghucheng
|
477e89a09e
|
* Fix bug.
|
2022-03-11 14:03:30 +08:00 |
|
|
孙广明
|
5084aea498
|
Merge branch 'autotest_ly' into 'master'
Add execution
See merge request easycorp/zentaopms!2195
|
2022-03-11 01:29:48 +00:00 |
|
|
liyang
|
681ac8cd7d
|
Add execution
|
2022-03-11 09:24:33 +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 |
|
|
孙广明
|
c1a18dffb2
|
Merge branch 'sprint/187_tianshujie_20591' into 'master'
* Fix bug #20591.
See merge request easycorp/zentaopms!2192
|
2022-03-11 01:16:47 +00: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 |
|
|
王怡栋
|
d001d76edf
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 16:32:30 +08:00 |
|
|
王怡栋
|
55beac7f83
|
* fix bug #20581.
|
2022-03-10 16:31:46 +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 |
|
|
孙广明
|
8a0354d1fb
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Adjust for create and batchcreate user.
See merge request easycorp/zentaopms!2183
|
2022-03-10 08:20:04 +00: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 |
|
|
孙广明
|
ffeeafaa36
|
Merge branch 'sprint/187_hufangzhou_makefile' into 'master'
* Adjust the makefile.
See merge request easycorp/zentaopms!2191
|
2022-03-10 08:05:46 +00:00 |
|
|
hufangzhou
|
59e2f0579a
|
* Adjust the makefile.
|
2022-03-10 16:00:51 +08:00 |
|
|
孙广明
|
8f223528d0
|
Merge branch 'sprint/187_tianshujie_20546' into 'master'
* Fix bug #20546.
See merge request easycorp/zentaopms!2190
|
2022-03-10 07:42:46 +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 |
|
|
孙广明
|
c98a11da7a
|
Merge branch 'autotest_ly' into 'master'
Add execution test
See merge request easycorp/zentaopms!2189
|
2022-03-10 07:19:40 +00:00 |
|
|
liyang
|
6c50fffa51
|
Add execution test
|
2022-03-10 15:15:47 +08:00 |
|
|
tianshujie
|
7e89329205
|
* Fix bug #20546.
|
2022-03-10 15:09:54 +08:00 |
|
|
孙广明
|
394c6886ab
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of computeHours4Multiple.
See merge request easycorp/zentaopms!2188
|
2022-03-10 07:00:26 +00:00 |
|
|
liumengyi
|
74ad0e261b
|
* Add teamtask.yaml.
|
2022-03-10 14:58:09 +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 |
|
|
王怡栋
|
7ca513e84b
|
Merge branch 'sprint/master_lanzongjun_fixbug'
|
2022-03-10 14:17:01 +08:00 |
|
|
sgm0422
|
ca5624db56
|
* Fix upgrade error.
|
2022-03-10 14:16:48 +08:00 |
|
|
王怡栋
|
9f177b0c85
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/dept/model.php
|
2022-03-10 06:15:21 +00:00 |
|
|
Zongjun Lan
|
7af31d0356
|
* fix bug #20472
|
2022-03-10 14:13:34 +08:00 |
|
|
liumengyi
|
201aa2f257
|
* Add auto test of computeHours4Multiple.
|
2022-03-10 14:08:54 +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 |
|
|
孙广明
|
208f4f211d
|
Merge branch 'sprint/187_tianshujie_fixbug' into 'master'
* Fix bug #15980.
See merge request easycorp/zentaopms!2181
|
2022-03-10 03:18:56 +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 |
|
|
朱金勇
|
e591bf4c98
|
Merge branch 'sgm_upgrade' into 'master'
* Add pro upgrade to biz.
See merge request easycorp/zentaopms!2179
|
2022-03-10 02:46:36 +00: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 |
|
|
Zongjun Lan
|
35037714b5
|
* fix bug #20472
|
2022-03-10 10:13:36 +08: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 |
|
|
朱金勇
|
8a9d8c5a24
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2174
|
2022-03-10 01:50:14 +00:00 |
|