Commit Graph

Select branches

Hide Pull Requests

clay

dj

dm

gary

hzlt

master

prod

role

uesr

xqhz

zhangkaihuai-patch-1

#1

#10

#100

#1000

#1001

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#101

#1010

#1011

#1012

#1013

#1014

#1015

#1016

#1017

#1018

#1019

#102

#1020

#1021

#1022

#1023

#1024

#1025

#1026

#1027

#1028

#1029

#103

#1030

#1031

#1032

#1033

#1034

#1035

#1036

#1037

#1038

#1039

#104

#1040

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1048

#1049

#105

#1050

#1051

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#106

#1060

#1061

#1062

#1063

#1064

#1065

#1066

#1067

#1068

#1069

#107

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#108

#1080

#1081

#1082

#1083

#1084

#1085

#1086

#1087

#1088

#1089

#109

#1090

#1091

#1092

#1093

#1094

#1095

#1096

#1097

#1098

#1099

#11

#110

#1100

#1101

#1102

#1103

#1104

#1105

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#49

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#50

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#54

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#56

#560

#561

#562

#563

#564

#565

#566

#567

#568

#569

#57

#570

#571

#572

#573

#574

#575

#576

#577

#578

#579

#58

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#59

#590

#591

#592

#593

#594

#595

#596

#597

#598

#599

#6

#60

#600

#601

#602

#603

#604

#605

#606

#607

#608

#609

#61

#610

#611

#612

#613

#614

#615

#616

#617

#618

#619

#62

#620

#621

#622

#623

#624

#625

#626

#627

#628

#629

#63

#630

#631

#632

#633

#634

#635

#636

#637

#638

#639

#64

#640

#641

#642

#643

#644

#645

#646

#647

#648

#649

#65

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#66

#660

#661

#662

#663

#664

#665

#666

#667

#668

#669

#67

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#68

#680

#681

#682

#683

#684

#685

#686

#687

#688

#689

#69

#690

#691

#692

#693

#694

#695

#696

#697

#698

#699

#7

#70

#700

#701

#702

#703

#704

#705

#706

#707

#708

#709

#71

#710

#711

#712

#713

#714

#715

#716

#717

#718

#719

#72

#720

#721

#722

#723

#724

#725

#726

#727

#728

#729

#73

#730

#731

#732

#733

#734

#735

#736

#737

#738

#739

#74

#740

#741

#742

#743

#744

#745

#746

#747

#748

#749

#75

#750

#751

#752

#753

#754

#755

#756

#757

#758

#759

#76

#760

#761

#762

#763

#764

#765

#766

#767

#768

#769

#77

#770

#771

#772

#773

#774

#775

#776

#777

#778

#779

#78

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#79

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#8

#80

#800

#801

#802

#803

#804

#805

#806

#807

#808

#809

#81

#810

#811

#812

#813

#814

#815

#816

#817

#818

#819

#82

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#83

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#84

#840

#841

#842

#843

#844

#845

#846

#847

#848

#849

#85

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#86

#860

#861

#862

#863

#864

#865

#866

#867

#868

#869

#87

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#88

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#89

#890

#891

#892

#893

#894

#895

#896

#897

#898

#899

#9

#90

#900

#901

#902

#903

#904

#905

#906

#907

#908

#909

#91

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#92

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#93

#930

#931

#932

#933

#934

#935

#936

#937

#938

#939

#94

#940

#941

#942

#943

#944

#945

#946

#947

#948

#949

#95

#950

#951

#952

#953

#954

#955

#956

#957

#958

#959

#96

#960

#961

#962

#963

#964

#965

#966

#967

#968

#969

#97

#970

#971

#972

#973

#974

#975

#976

#977

#978

#979

#98

#980

#981

#982

#983

#984

#985

#986

#987

#988

#989

#99

#990

#991

#992

#993

#994

#995

#996

#997

#998

#999

Mono Color

• da69cb4dba Merge pull request 'master' (#980) from master into prod odjbin 2025-04-09 02:59:02 +00:00
• cc1d0c8cf2 Merge pull request 'fix : 修复项目实施附件上传功能' (#979) from dj into master odjbin 2025-04-09 02:58:50 +00:00
• f3d9ff44a3 fix : 修复项目实施附件上传功能 dj 2025-04-09 10:58:26 +08:00
• 375a678fc3 Merge pull request 'master' (#978) from master into prod odjbin 2025-04-09 01:42:30 +00:00
• a3cbf4d24b Merge pull request 'fix : 修复项目实施附件上传功能' (#977) from dj into master odjbin 2025-04-09 01:42:17 +00:00
• d3b12bd64c fix : 修复项目实施附件上传功能 dj 2025-04-09 09:37:53 +08:00
• c213b3b41c Merge pull request 'master' (#976) from master into prod odjbin 2025-04-08 16:24:02 +00:00
• d0c677cfb4 Merge pull request 'dj' (#975) from dj into master odjbin 2025-04-08 16:23:33 +00:00
• e9469439e8 Merge remote-tracking branch 'origin/dj' dj 2025-04-09 00:16:51 +08:00
• 62035606c9 Merge pull request 'master' (#974) from master into dj odjbin 2025-04-08 16:16:26 +00:00
• b101d70c75 fix: 修复附件上传和展示问题 dj 2025-04-09 00:15:01 +08:00
• 382bad4cb3 Merge pull request 'master' (#973) from master into prod odjbin 2025-04-08 16:14:37 +00:00
• 8c5d08874f fix: 修复附件上传和展示问题 dj 2025-04-09 00:14:10 +08:00
• 25d5b20b65 fix: 修复附件上传和展示问题 dj 2025-04-09 00:13:51 +08:00
• 2f43919132 fix: 分摊明细导出调整参数 dj 2025-04-08 23:05:42 +08:00
• 8f5b9fc637 Merge pull request 'fix: 分摊明细导出调整参数' (#972) from master into prod odjbin 2025-04-07 16:30:53 +00:00
• 7b619a9bef fix: 分摊明细导出调整参数 dj 2025-04-08 00:30:32 +08:00
• f33543c540 Merge pull request 'fix: 优化首页通知公告样式' (#971) from master into prod odjbin 2025-04-07 13:57:40 +00:00
• a9a2be2c74 fix: 优化首页通知公告样式 dj 2025-04-07 21:57:13 +08:00
• 3160e86710 Merge pull request 'fix: 优化移动端项目管理功能' (#970) from master into prod odjbin 2025-04-06 14:38:30 +00:00
• a307697028 fix: 优化移动端项目管理功能 dj 2025-04-06 22:38:14 +08:00
• 062f9c7bee Merge pull request 'feat(article-management): 首页通知公告加时间, 将"备注"字段改为"发文单位"' (#969) from master into prod odjbin 2025-04-06 13:26:05 +00:00
• e8a5b4e788 feat(article-management): 首页通知公告加时间, 将"备注"字段改为"发文单位" dj 2025-04-06 21:25:30 +08:00
• da9624663e Merge pull request 'master' (#968) from master into prod odjbin 2025-04-06 09:11:03 +00:00
• 7b8cedcfb0 Merge pull request 'master' (#967) from master into dj odjbin 2025-04-06 09:10:49 +00:00
• d3c0b36657 refactor(views/components): 优化首页通知公告展示和项目附件搜索功能 dj 2025-04-06 17:10:08 +08:00
• eabf9cb3d6 refactor(project): 优化项目相关页面显示内容 dj 2025-04-06 16:47:23 +08:00
• b84c2ce131 Merge pull request 'feat(project-management): 优化文件归档表格状态展示和权限控制' (#966) from master into prod odjbin 2025-04-02 16:34:20 +00:00
• 348027f355 feat(project-management): 优化文件归档表格状态展示和权限控制 dj 2025-04-03 00:34:04 +08:00
• 579f2777cf Merge pull request 'master' (#965) from master into prod odjbin 2025-04-02 16:11:32 +00:00
• ed22942ab2 fix(project-management): 优化附件启用禁用操作反馈 dj 2025-04-03 00:11:21 +08:00
• 119e3d8333 feat(ProjectAttachment): 优化文件上传标签逻辑 dj 2025-04-03 00:09:41 +08:00
• 011566cb22 Merge pull request 'feat(ProjectAttachment): 添加文件下载功能' (#964) from master into prod odjbin 2025-04-02 15:37:56 +00:00
• bf34d8aa0c feat(ProjectAttachment): 添加文件下载功能 dj 2025-04-02 23:34:45 +08:00
• 7f3fedc2f2 Merge pull request 'master' (#963) from master into prod odjbin 2025-04-02 15:28:05 +00:00
• 69aa6aa0fb refactor(project-demand): 优化需求变更时特殊基金逻辑 dj 2025-04-02 23:26:01 +08:00
• e54db551a6 feat(project-demand): 添加需求征集变更逻辑 dj 2025-04-02 23:01:17 +08:00
• 6c91a0740a Merge pull request 'fix: 修改分摊明细页面路由跳转逻辑' (#962) from master into dj odjbin 2025-04-01 16:06:24 +00:00
• f0fe6c8269 Merge pull request 'master' (#961) from master into prod odjbin 2025-04-01 16:06:06 +00:00
• 9174c09a6b fix: 修改分摊明细页面路由跳转逻辑 dj 2025-04-02 00:05:48 +08:00
• 4dc5ca40ee feat(share-detail): 添加分摊导出按钮 dj 2025-04-02 00:02:49 +08:00
• 09705e634a Merge pull request 'feat(expense-management): 新增费用分摊功能并优化项目管理相关页面' (#960) from master into prod odjbin 2025-04-01 15:58:33 +00:00
• 1e29e6bdc4 feat(expense-management): 新增费用分摊功能并优化项目管理相关页面 dj 2025-04-01 23:57:46 +08:00
• e49d8cfb5e Merge pull request 'master' (#959) from master into prod odjbin 2025-04-01 10:19:27 +00:00
• a3bb1a9156 Merge pull request 'feat: 支出明细筛选和导出功能' (#958) from dj into master odjbin 2025-04-01 10:19:16 +00:00
• e9ced267ed feat: 支出明细筛选和导出功能 dj 2025-04-01 13:04:34 +08:00
• ef9a536b5c Merge pull request 'master' (#957) from master into prod odjbin 2025-03-31 15:16:40 +00:00
• a87be0e6e2 Merge pull request 'dj' (#956) from dj into master odjbin 2025-03-31 15:16:28 +00:00
• 98d8ea4805 feat(expense-management): 新增费用分摊功能并优化项目管理相关页面 dj 2025-03-31 23:14:54 +08:00
• 244f2e72b4 feat: 项目基本信息新增实际经费预算和专项资金相关字段 dj 2025-03-31 14:12:28 +08:00
• f9aa6191ce feat(project-manage): 新增项目附件标签功能 dj 2025-03-30 15:06:56 +08:00
• ebd7fa3851 feat(project-manage): 新增项目附件标签功能 dj 2025-03-30 15:06:39 +08:00
• 2941847f54 Merge pull request 'dj' (#955) from dj into master odjbin 2025-03-29 12:25:32 +00:00
• ca9e281119 feat(project-manage): 新增项目附件标签功能 dj 2025-03-29 20:24:53 +08:00
• a1ed160445 Merge remote-tracking branch 'origin/master' dj 2025-03-28 19:41:10 +08:00
• 9db0e8e9ec feat(expense-management): 新增费用分摊功能 dj 2025-03-25 15:17:08 +08:00
• fe09ced0bc Merge pull request 'master' (#954) from master into prod odjbin 2025-03-25 06:37:02 +00:00
• d73eb49461 Merge pull request 'dj' (#953) from dj into master odjbin 2025-03-25 06:28:09 +00:00
• b890372fc5 feat(ProjectAttachment): 优化项目附件组件功能和布局 dj 2025-03-25 14:27:48 +08:00
• 53bab74ea9 feat(project-management): 更新项目管理相关页面文案并优化附件功能 dj 2025-03-22 23:11:09 +08:00
• 023256630e 更新 Dockerfile zhangkaihuai 2025-03-19 12:24:06 +00:00
• f65663071a 更新 nginx.conf zhangkaihuai 2025-03-19 12:13:31 +00:00
• 9a55494da7 更新 nginx.conf zhangkaihuai 2025-03-19 08:07:37 +00:00
• d5a07e772f 更新 nginx.conf zhangkaihuai 2025-03-19 07:55:07 +00:00
• 42499bcb22 更新 nginx.conf zhangkaihuai 2025-03-19 07:40:27 +00:00
• 0243d6fc56 Merge pull request '更新 nginx.conf' (#952) from gary into prod zhangkaihuai 2025-03-19 07:34:21 +00:00
• 6bdbde262f 更新 nginx.conf gary zhangkaihuai 2025-03-19 07:34:04 +00:00
• 78435bbcac Merge pull request 'gary' (#951) from gary into prod zhangkaihuai 2025-03-19 07:32:49 +00:00
• c3358acf73 Merge remote-tracking branch 'origin/gary' zhangkaihuai 2025-03-19 15:32:05 +08:00
• 3b1b822882 nginx ssl 证书配置 zhangkaihuai 2025-03-19 15:29:56 +08:00
• f874cd75b7 Merge pull request 'master' (#950) from master into prod odjbin 2025-03-13 13:35:25 +00:00
• d9a5099436 Merge pull request 'dj' (#949) from dj into master odjbin 2025-03-13 13:35:11 +00:00
• dd75bc6513 fix: 修复汇总列表征集名称筛选判重 dj 2025-03-13 21:34:48 +08:00
• d3506d841e fix: 注释掉需求添加和附件上传中的标签编辑功能 dj 2025-03-10 21:25:12 +08:00
• 263df9e489 feat: 列表新增征集, 筛选新增公司,征集名称 dj 2025-03-10 17:42:21 +08:00
• 65b76da880 Merge pull request 'master' (#948) from master into prod odjbin 2025-03-08 11:23:50 +00:00
• 50973efb0a Merge pull request 'feat(system): 新增审批白名单功能并优化用户列表' (#947) from dj into master odjbin 2025-03-08 11:23:40 +00:00
• 8256c80648 feat(system): 新增审批白名单功能并优化用户列表 dj 2025-03-08 19:23:17 +08:00
• d0dc8ba9f8 Merge pull request 'master' (#946) from master into prod odjbin 2025-03-08 09:48:33 +00:00
• 97e9799b1a Merge pull request 'dj' (#945) from dj into master odjbin 2025-03-08 09:48:20 +00:00
• e81b2bc42f feat(system): 新增审批白名单功能并优化用户列表 dj 2025-03-08 17:47:54 +08:00
• 9c297d92c9 feat : 需求征集新增公司筛选 dj 2025-03-02 22:16:12 +08:00
• e2de62e54a Merge pull request 'master' (#944) from master into prod odjbin 2024-12-21 07:08:22 +00:00
• a3b1f96ab6 Merge pull request 'fix:移除未使用的文件下载和删除功能' (#943) from dj into master odjbin 2024-12-21 07:07:45 +00:00
• d2c77b9cc2 fix:移除未使用的文件下载和删除功能 dj 2024-12-21 15:07:10 +08:00
• 61feb031aa Merge pull request 'master' (#942) from master into prod odjbin 2024-12-21 06:50:05 +00:00
• b06b4b88bb Merge pull request 'fix: 优化文件删除逻辑(采用前端删除文件)' (#941) from dj into master odjbin 2024-12-21 06:49:55 +00:00
• 560fd3af3b fix: 优化文件删除逻辑(采用前端删除文件) dj 2024-12-21 14:49:32 +08:00
• e5b5b26e24 Merge pull request 'master' (#940) from master into prod odjbin 2024-12-20 15:32:31 +00:00
• 19aa70a8ca Merge pull request 'fix: 优化文件删除逻辑(采用前端删除文件)' (#939) from dj into master odjbin 2024-12-20 15:32:21 +00:00
• 06af12ca88 fix: 优化文件删除逻辑(采用前端删除文件) dj 2024-12-20 22:27:22 +08:00
• 41b04e6fac Merge pull request 'master' (#938) from master into prod odjbin 2024-12-19 15:07:32 +00:00
• 96d912ff44 Merge pull request 'fix: 修改流程审批字样' (#937) from dj into master odjbin 2024-12-19 15:07:23 +00:00
• 10f1afe23c fix: 修改流程审批字样 dj 2024-12-19 23:07:06 +08:00
• 0f2cb87f66 Merge pull request 'master' (#936) from master into prod odjbin 2024-12-19 14:26:49 +00:00
• e10978cadd Merge pull request 'dj' (#935) from dj into master odjbin 2024-12-19 14:26:36 +00:00
• 7ce2d6edb7 fix: 修改多图片上传页面 dj 2024-12-19 22:26:17 +08:00
• 5f8a29f2d6 fix: 修改用户选择器标题文案 dj 2024-12-15 00:20:28 +08:00
• ccba937158 Merge pull request 'master' (#934) from master into prod odjbin 2024-12-14 14:54:58 +00:00
• efe27b8580 Merge pull request 'fix : 优化需求上报时需求征集显示' (#933) from dj into master odjbin 2024-12-14 14:54:46 +00:00