解决合并冲突

hzj

1 天以前 82954f31a43d8f6c2c76b24bf09fd45502c24638

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
<?php
/**
 *  TODO 补充说明 
 *
 * User: jiehua
 * Date: 16/3/30
 * Time: 下午8:55
 */
 
class EncryptParseItem {
 
 
    public $startIndex;
 
    public $endIndex;
 
    public $encryptContent;
 
}