 Zongjun Lan
|
cf40dbba88
|
remove a line
|
2022-02-24 13:11:37 +08:00 |
|
|
Zongjun Lan
|
8d397cac21
|
* Fix bug #49355
|
2022-02-24 08:53:13 +08:00 |
|
|
Zongjun Lan
|
245a062277
|
modify code format
|
2022-02-23 11:34:17 +08:00 |
|
|
Zongjun Lan
|
91f09fe484
|
modify code format
|
2022-02-23 11:27:10 +08:00 |
|
|
Zongjun Lan
|
f6b9ade20a
|
* Fix bug #49335
|
2022-02-23 11:07:27 +08:00 |
|
|
王怡栋
|
6486986b5a
|
Merge branch 'sprint/185_tanghucheng_49418' into 'sprint/185'
* Finish task #49415,49418,49425,49418,49402.
See merge request easycorp/zentaopms!1873
|
2022-02-22 01:49:27 +00:00 |
|
|
tanghucheng
|
4ffb8c996c
|
* Finish task #49402.
|
2022-02-22 09:46:00 +08:00 |
|
|
zhujinyong
|
1f8e1b0021
|
* Fix return print() -> return.
|
2022-02-22 09:35:25 +08:00 |
|
|
zhujinyong
|
5a334ccb86
|
* Fix bug: return error.
|
2022-02-22 09:26:31 +08:00 |
|
|
tanghucheng
|
f650bc44c7
|
* Finish task #49415,49418,49425.
|
2022-02-22 09:19:27 +08:00 |
|
|
zhujinyong
|
002e215a3d
|
* Move die to return.
|
2022-02-22 09:02:00 +08:00 |
|
|
zhujinyong
|
b17c3c8206
|
* Move die to return print.
|
2022-02-22 08:42:32 +08:00 |
|
|
孙广明
|
8f728c5463
|
Merge branch 'sprint/185_fixbug_wangyidong' into sprint/185
|
2022-02-22 08:33:59 +08:00 |
|
|
孙广明
|
5ff758878e
|
Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
# module/common/model.php
|
2022-02-22 00:32:35 +00:00 |
|
|
tanghucheng
|
9b6903f6eb
|
* Finish task#49418.
|
2022-02-21 17:23:09 +08:00 |
|
|
王怡栋
|
1955a0ec04
|
Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* code for task #49697.
See merge request easycorp/zentaopms!1869
|
2022-02-21 09:19:35 +00:00 |
|
|
王怡栋
|
06352f4354
|
* code for task #49337.
|
2022-02-21 17:14:10 +08:00 |
|
|
tanghucheng
|
911ceb027b
|
* code for task #49697.
|
2022-02-21 17:07:46 +08:00 |
|
|
tanghucheng
|
422811bcbd
|
* code for task #49697.
|
2022-02-21 17:01:42 +08:00 |
|
|
王怡栋
|
78110fb10a
|
* code for task #49364.
|
2022-02-21 16:56:23 +08:00 |
|
|
李玉春
|
9f5629fc96
|
Merge branch 'sprint/185_fixbug_19809' into 'sprint/185'
* Fix bug #19809.
See merge request easycorp/zentaopms!1865
|
2022-02-21 08:35:38 +00:00 |
|
|
王怡栋
|
2f521db75c
|
* code for task #49362.
|
2022-02-21 15:59:24 +08:00 |
|
|
zhouxudong
|
b525288fb2
|
* Fix bug #19809.
|
2022-02-21 15:13:27 +08:00 |
|
|
王怡栋
|
d80b711da0
|
Merge branch 'sprint/185_lwr_fixbug_19195' into 'sprint/185'
* push to array with braces not plus sign, bug #19195.
See merge request easycorp/zentaopms!1862
|
2022-02-21 05:21:51 +00:00 |
|
|
王怡栋
|
0cb4581eec
|
Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* Finish task #49697.
See merge request easycorp/zentaopms!1856
|
2022-02-21 05:21:01 +00:00 |
|
|
tanghucheng
|
743a8872ee
|
* Code for task.
|
2022-02-21 13:18:48 +08:00 |
|
|
tanghucheng
|
510e7397d4
|
* Finish task #49697.
|
2022-02-21 13:12:51 +08:00 |
|
|
王怡栋
|
e81524fb25
|
* code for task #49357.
|
2022-02-21 11:35:52 +08:00 |
|
|
王怡栋
|
7b92be407d
|
Merge branch 'sprint/185_lwr_visionSwitchEnhance' into 'sprint/185'
* make vision unswitchable for users without multiple visions.
See merge request easycorp/zentaopms!1861
|
2022-02-21 03:26:44 +00:00 |
|
|
Wenrui LI
|
59892b5d77
|
* push to array with braces not plus sign, bug #19195.
|
2022-02-21 11:26:22 +08:00 |
|
|
王怡栋
|
d5f74b39a5
|
* finish task #49087.
|
2022-02-21 10:58:54 +08:00 |
|
|
李玉春
|
96c32c4df2
|
Merge branch 'sprint/185_zxd_49296' into 'sprint/185'
* Finish task #49296.
See merge request easycorp/zentaopms!1860
|
2022-02-21 02:39:05 +00:00 |
|
|
zhujinyong
|
4f32cb8a1c
|
+ Add xuan extension.
|
2022-02-21 10:30:38 +08:00 |
|
|
Wenrui LI
|
3e515ea4dd
|
* make vision unswitchable for users without multiple visions.
|
2022-02-21 10:29:00 +08:00 |
|
|
zhouxudong
|
ae2ad29753
|
* Finish task #49296.
|
2022-02-21 09:56:42 +08:00 |
|
|
李玉春
|
c280365ce8
|
Merge branch 'sprint/185_zhengrunyu_49303' into 'sprint/185'
Sprint/185 zhengrunyu 49303
See merge request easycorp/zentaopms!1857
|
2022-02-21 01:27:02 +00:00 |
|
|
zhengrunyu
|
1a8f317229
|
*Finish task 49303
|
2022-02-21 09:07:30 +08:00 |
|
|
王怡栋
|
490aad596e
|
* code for task #49698.
|
2022-02-21 08:53:36 +08:00 |
|
|
tanghucheng
|
8db3ec184c
|
* Finish task #49697.
|
2022-02-21 08:34:14 +08:00 |
|
|
王怡栋
|
722b9c5538
|
* adjust code.
|
2022-02-18 16:27:41 +08:00 |
|
|
王怡栋
|
d9743e6b0a
|
Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong
|
2022-02-18 15:57:45 +08:00 |
|
|
王怡栋
|
3c5ed57c29
|
* code for task #49698.
|
2022-02-18 15:55:29 +08:00 |
|
|
孙广明
|
176a8fa648
|
Merge branch 'sprint/185_xieqiyu_49308' into 'sprint/185'
* Finish task#49308.
See merge request easycorp/zentaopms!1849
|
2022-02-18 07:40:04 +00:00 |
|
|
孙广明
|
17b10d3e4f
|
Merge branch 'sprint/185_fixbug_wangyidong' into sprint/185
|
2022-02-18 15:25:36 +08:00 |
|
|
孙广明
|
e90059443b
|
Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
# module/common/model.php
|
2022-02-18 07:25:15 +00:00 |
|
|
王怡栋
|
221aab879e
|
* adjust for task #49373.
|
2022-02-18 15:05:44 +08:00 |
|
|
孙广明
|
a453e3109e
|
Merge branch 'sprint/185_zhangzilong_49284' into sprint/185
|
2022-02-18 14:24:11 +08:00 |
|
|
孙广明
|
ffbbfe417f
|
Merge branch 'sprint/185' into 'sprint/185_zhangzilong_49284'
# Conflicts:
# db/update16.4.sql
|
2022-02-18 06:23:22 +00:00 |
|
|
zhangzilong
|
e56df2bc34
|
remove file.
|
2022-02-18 14:22:15 +08:00 |
|
|
zhangzilong
|
6dbeb7fe40
|
* Finish task #49284.
|
2022-02-18 14:17:20 +08:00 |
|