zhengrunyu
|
3e4fa30030
|
*Finish task #45150.
|
2021-12-01 10:14:15 +08:00 |
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
李玉春
|
2d1e0bb3dc
|
Merge branch 'sprint/168_sgm_45160' into 'sprint/168'
* Finish task #45160.
See merge request easycorp/zentaopms!664
|
2021-11-30 05:15:34 +00:00 |
|
李玉春
|
4b223ec01b
|
Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.
See merge request easycorp/zentaopms!657
|
2021-11-30 05:02:41 +00:00 |
|
mayue
|
71387b1d37
|
* Finish task #44987,44988,44989.
|
2021-11-30 11:26:48 +08:00 |
|
孙广明
|
38619abdd8
|
* Finish task #45160.
|
2021-11-30 11:08:33 +08:00 |
|
zhengrunyu
|
46a9f157b1
|
*Finish task #45148.
|
2021-11-30 10:56:09 +08:00 |
|
mayue
|
f2d867870a
|
* Finish task #44987,44988,44989.
|
2021-11-30 10:55:41 +08:00 |
|
mayue
|
d89aa24c8c
|
* Finish task #44987,44988,44989.
|
2021-11-30 10:32:11 +08:00 |
|
mayue
|
19d489a645
|
* Fix bug #44987,44988,44989.
|
2021-11-30 09:27:50 +08:00 |
|
zhengrunyu
|
e78c876216
|
*Finish task #45148.
|
2021-11-30 09:22:04 +08:00 |
|
tianshujie
|
7e225ce3f7
|
* Finish task #45081,45012.
|
2021-11-30 09:18:05 +08:00 |
|
tianshujie
|
0c33d76709
|
* Finish task #45081.
|
2021-11-29 17:14:01 +08:00 |
|
mayue
|
7a5c062947
|
* Finish task #44987,44988,44989.
|
2021-11-29 16:15:50 +08:00 |
|
李玉春
|
a99419f0c5
|
Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
# module/product/control.php
# module/story/view/batchedit.html.php
|
2021-11-29 08:03:38 +00:00 |
|
tianshujie
|
adb2c12935
|
* Modify the code.
|
2021-11-29 15:54:48 +08:00 |
|
mayue
|
a77510b311
|
* Finish task #44987,44988,44989.
|
2021-11-29 15:11:16 +08:00 |
|
孙广明
|
5ad303eca9
|
Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080
See merge request easycorp/zentaopms!644
|
2021-11-29 06:58:17 +00:00 |
|
tianshujie
|
96a46aa2ca
|
* Modify the code.
|
2021-11-29 14:16:10 +08:00 |
|
zhengrunyu
|
b3c8ee7ccb
|
*Finish task #45148.
|
2021-11-29 09:29:44 +08:00 |
|
xieqiyu
|
763ae6ea87
|
* Code for task#45082.
|
2021-11-28 19:54:47 +08:00 |
|
tianshujie
|
582f0e036d
|
* Finish task #45043.
|
2021-11-27 18:14:41 +08:00 |
|
tianshujie
|
3bddd21087
|
* Finish task #45083.
|
2021-11-27 17:58:52 +08:00 |
|
tianshujie
|
f4d1a727a7
|
* Finish task #45084,44994,44993.
|
2021-11-27 17:41:42 +08:00 |
|
tianshujie
|
066db150a4
|
* Solve the problem of plan creation and execution error.
|
2021-11-27 09:52:47 +08:00 |
|
zhengrunyu
|
9dac5358e3
|
*Finish task #45148.
|
2021-11-26 15:20:17 +08:00 |
|
王怡栋
|
c15bf759b9
|
* code for task #44937.
|
2021-11-26 10:40:54 +08:00 |
|
zhengrunyu
|
07363c68ff
|
*Finish task #45148.
|
2021-11-26 09:01:56 +08:00 |
|
zhengrunyu
|
119a3fab7d
|
*Finish task #45151.
|
2021-11-26 08:48:26 +08:00 |
|
zhengrunyu
|
2f41e85fda
|
*Finish task #sprint/168_zhengrunyu_45148.
|
2021-11-26 08:30:55 +08:00 |
|
zhengrunyu
|
3340a383f1
|
*Finish task #45151.
|
2021-11-25 15:03:43 +08:00 |
|
朱金勇
|
293a375ec8
|
Merge branch 'sprint/174_mayue_16605' into 'master'
Fix bug #16605.
See merge request easycorp/zentaopms!616
|
2021-11-25 06:45:58 +00:00 |
|
mayue
|
1cf28e1120
|
* Fix bug #16605.
|
2021-11-25 13:20:54 +08:00 |
|
王怡栋
|
385cb41a0e
|
* code for task #44938.
|
2021-11-25 11:35:46 +08:00 |
|
mayue
|
c2c13a9079
|
* Fix bug #16605.
|
2021-11-25 09:53:49 +08:00 |
|
mayue
|
c40360d556
|
* Fix bug #16605.
|
2021-11-25 09:43:34 +08:00 |
|
王怡栋
|
d9ee0bfbf7
|
Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
# module/mr/model.php
|
2021-11-25 00:32:52 +00:00 |
|
tianshujie
|
179e766478
|
* Modify function name.
|
2021-11-24 16:45:08 +08:00 |
|
zhouxin
|
2b3df26fd8
|
Fix bug 16564.
|
2021-11-23 18:47:56 +08:00 |
|
tianshujie
|
33e557cd18
|
* Fix bug #16577.
|
2021-11-23 15:07:07 +08:00 |
|
tianshujie
|
ec5ca42e49
|
* Fix bug #16577.
|
2021-11-23 15:01:51 +08:00 |
|
hufangzhou
|
c0d4264148
|
* Fix bug #16564.
|
2021-11-23 10:10:14 +08:00 |
|
王怡栋
|
74a41448dc
|
* add lang for mobile api.
|
2021-11-23 09:35:16 +08:00 |
|
王怡栋
|
90a913ca4b
|
Merge branch 'sprint/170'
|
2021-11-22 16:59:40 +08:00 |
|
hufangzhou
|
6d03387d4b
|
* Add the new version.
|
2021-11-22 16:48:28 +08:00 |
|
tianshujie
|
7802bc6a47
|
* Fix bug #16541.
|
2021-11-22 16:01:31 +08:00 |
|
孙广明
|
11a320555c
|
Merge branch 'sprint/172_liyuchun_16384' into 'sprint/168'
* Adjust execution button name.
See merge request easycorp/zentaopms!578
|
2021-11-22 06:50:34 +00:00 |
|
hufangzhou
|
63bc9f80c4
|
* Fix bug #16509.
|
2021-11-22 14:11:13 +08:00 |
|
liyuchun
|
da47c729d9
|
* Adjust execution button name.
|
2021-11-22 13:36:52 +08:00 |
|
zhengrunyu
|
a6db2057d9
|
*Finish task #16521.
|
2021-11-22 11:12:15 +08:00 |
|