作者 刘锟

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into akun

@@ -271,7 +271,7 @@ class ProjectController extends BaseController @@ -271,7 +271,7 @@ class ProjectController extends BaseController
271 $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']); 271 $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']);
272 $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']); 272 $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']);
273 $item['plan'] = Project::planMap()[$item['plan']]; 273 $item['plan'] = Project::planMap()[$item['plan']];
274 - $item['created_at'] = date('Y年m月d日', strtotime($item['created_at'])); 274 + $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date']));
275 $item['autologin_code'] = getAutoLoginCode($item['id']); 275 $item['autologin_code'] = getAutoLoginCode($item['id']);
276 $domainModel = new DomainInfo(); 276 $domainModel = new DomainInfo();
277 $item['domain'] = !empty($item['domain']) ? $domainModel->getDomain($item['domain']) : ''; 277 $item['domain'] = !empty($item['domain']) ? $domainModel->getDomain($item['domain']) : '';
@@ -256,7 +256,7 @@ class ProjectLogic extends BaseLogic @@ -256,7 +256,7 @@ class ProjectLogic extends BaseLogic
256 * @method :post 256 * @method :post
257 * @time :2023/9/12 11:20 257 * @time :2023/9/12 11:20
258 */ 258 */
259 - public function setTypeStatusEdit($param){ 259 + public function setTypeSevenEdit($param){
260 //TODO::删除项目并添加到续费单 260 //TODO::删除项目并添加到续费单
261 261
262 return true; 262 return true;