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

• 460dd793cf Merge pull request 'dj' (#115) from dj into master odjbin 2024-05-09 10:11:32 +00:00
• be5150c7c4 feat: 初始化需求征集主页面 odjbin 2024-05-09 18:11:11 +08:00
• 233f44990d Merge pull request 'master' (#114) from master into dj odjbin 2024-05-09 09:36:35 +00:00
• 3403ca7ecb Merge pull request 'xqhz' (#113) from xqhz into master wenhua 2024-05-09 09:33:33 +00:00
• 28b4637e01 feat: 初始化需求汇总主页面 lilinyuan 2024-05-09 17:33:01 +08:00
• 639caadc46 fix: 修复bug lilinyuan 2024-05-09 17:32:36 +08:00
• 6557b5d2c8 fix: 修复bug lilinyuan 2024-05-09 17:32:21 +08:00
• 86610c07a8 Merge pull request 'master' (#112) from master into prod odjbin 2024-05-09 09:18:40 +00:00
• 4f6b2dcc27 Merge pull request 'feat : 新增首页界面' (#111) from dj into master odjbin 2024-05-09 09:17:30 +00:00
• dcc6866211 feat : 新增首页界面 odjbin 2024-05-09 17:16:39 +08:00
• 0e0e1f9bb9 Merge pull request 'feat: 初始化项目需求目录及页面文件' (#110) from master into xqhz wenhua 2024-05-09 08:19:28 +00:00
• 0e0d206cc7 feat: 初始化项目需求目录及页面文件 lilinyuan 2024-05-09 16:14:48 +08:00
• bfe24e1207 Merge pull request 'role' (#109) from role into master wenhua 2024-05-09 07:30:12 +00:00
• d2521765be Merge branch 'role' of http://git.feashow.cn/clay/mosr-web into role role lilinyuan 2024-05-09 15:29:05 +08:00
• 5c1b66b03d feat: 新增sidermenu首页项 lilinyuan 2024-05-09 15:29:00 +08:00
• b336efa79c Merge pull request 'feat : 测试sso单点登录之后的重定向路径4' (#108) from master into prod clay 2024-04-29 03:50:07 +00:00
• 2bb86ced15 feat : 测试sso单点登录之后的重定向路径4 clay 2024-04-29 11:49:46 +08:00
• d010907d2b Merge pull request 'feat : 测试sso单点登录之后的重定向路径3' (#107) from master into prod clay 2024-04-29 03:28:30 +00:00
• 929228974a feat : 测试sso单点登录之后的重定向路径3 clay 2024-04-29 11:27:56 +08:00
• 894b656a82 Merge pull request 'feat : 测试sso单点登录之后的重定向路径' (#106) from master into prod clay 2024-04-29 02:31:44 +00:00
• eee3c3852e feat : 测试sso单点登录之后的重定向路径 clay 2024-04-29 10:31:18 +08:00
• 4b9ecb9360 Merge pull request 'feat : 测试sso单点登录之后的重定向路径' (#105) from master into prod clay 2024-04-29 02:22:08 +00:00
• 57bfb6f4a0 feat : 测试sso单点登录之后的重定向路径 clay 2024-04-29 10:20:58 +08:00
• 228fef7a9b Merge pull request 'feat : 测试sso单点登录之后的重定向路径' (#104) from master into prod clay 2024-04-29 02:11:08 +00:00
• 5d3ab890f3 feat : 测试sso单点登录之后的重定向路径 clay 2024-04-29 10:10:50 +08:00
• 6a6a440428 Merge pull request 'master' (#103) from master into prod clay 2024-04-29 02:04:25 +00:00
• 3eecc3f4b9 Merge pull request 'role' (#102) from role into master clay 2024-04-29 02:04:03 +00:00
• 29ea0d5fe4 feat : 测试sso单点登录之后的重定向路径 clay 2024-04-29 10:03:46 +08:00
• 8c1d2eeabe feat: 新增登录重定向之前被拦截的页面 lilinyuan 2024-04-29 09:58:18 +08:00
• ee9462769f Merge pull request 'master' (#101) from master into prod wenhua 2024-04-01 07:31:41 +00:00
• 9217f019e5 Merge pull request 'fix: 按钮逻辑' (#100) from role into master wenhua 2024-04-01 07:31:24 +00:00
• 24dfaac98a fix: 按钮逻辑 lilinyuan 2024-04-01 15:30:56 +08:00
• cf2f071f6d Merge pull request 'master' (#99) from master into prod wenhua 2024-04-01 07:09:01 +00:00
• 26b50d6103 Merge pull request 'fix: 调整菜单权限按钮' (#98) from role into master wenhua 2024-04-01 07:08:40 +00:00
• b5acea2e47 fix: 调整菜单权限按钮 lilinyuan 2024-04-01 15:02:09 +08:00
• 18113da288 Merge pull request 'master' (#97) from master into prod wenhua 2024-04-01 06:36:54 +00:00
• 12053b81b9 Merge pull request 'role' (#96) from role into master wenhua 2024-04-01 06:36:33 +00:00
• 39bc3011dd fix: 去掉操作列悬浮 lilinyuan 2024-04-01 14:36:02 +08:00
• 6e42dd43f7 fix: 组件调整 lilinyuan 2024-04-01 14:28:08 +08:00
• 1b10b9aa2b fix: 角色管理调整 lilinyuan 2024-04-01 14:27:52 +08:00
• 8964cbe4bd fix: 注释install lilinyuan 2024-04-01 13:58:03 +08:00
• 743f55c11d Merge pull request 'master' (#95) from master into prod wenhua 2024-04-01 05:49:16 +00:00
• 360f0dd92d Merge pull request 'fix: 修改依赖源地址' (#94) from role into master wenhua 2024-04-01 05:48:54 +00:00
• de971d224e fix: 修改依赖源地址 lilinyuan 2024-04-01 13:48:34 +08:00
• 4009f05185 Merge pull request 'master' (#93) from master into prod wenhua 2024-04-01 05:42:12 +00:00
• 68c4ca5dc9 Merge pull request 'fix: 修改依赖源' (#92) from role into master wenhua 2024-04-01 05:41:49 +00:00
• 5977480404 fix: 修改依赖源 lilinyuan 2024-04-01 13:41:23 +08:00
• 182572bfd1 Merge pull request 'master' (#91) from master into prod wenhua 2024-04-01 03:28:44 +00:00
• 8f922a8815 Merge pull request 'role' (#90) from role into master wenhua 2024-04-01 03:28:24 +00:00
• 508e391823 feat: 恢复 lilinyuan 2024-04-01 11:27:06 +08:00
• 2560ed701f fix: 暂时删除 lilinyuan 2024-04-01 11:25:27 +08:00
• 9123149565 feat: up dependencies lilinyuan 2024-04-01 11:23:51 +08:00
• f1e1def32c feat: up dependencies lilinyuan 2024-04-01 11:20:55 +08:00
• 5edd4ee722 Merge pull request 'master' (#86) from master into prod wenhua 2024-04-01 03:00:53 +00:00
• c3e582ad33 Merge pull request 'feat: up' (#85) from role into master wenhua 2024-04-01 03:00:32 +00:00
• e787128011 feat: up lilinyuan 2024-04-01 11:00:10 +08:00
• 497f1ad64e Merge pull request 'master' (#84) from master into prod wenhua 2024-04-01 02:21:19 +00:00
• fde73bd7b0 Merge pull request 'fix: 再试一次' (#83) from role into master wenhua 2024-04-01 02:20:57 +00:00
• 90f6bd344e fix: 再试一次 lilinyuan 2024-04-01 10:20:32 +08:00
• ff632ef4cf Merge pull request 'master' (#82) from master into prod wenhua 2024-04-01 02:14:40 +00:00
• ef46911a5b Merge pull request 'fix: 使用原始ui库' (#81) from role into master wenhua 2024-04-01 02:14:17 +00:00
• ffc5600b9b fix: 使用原始ui库 lilinyuan 2024-04-01 10:13:53 +08:00
• 3b0637e1b3 Merge pull request 'master' (#80) from master into dm clay 2024-04-01 02:00:42 +00:00
• 10d094a5b7 Merge pull request 'master' (#79) from master into prod wenhua 2024-04-01 01:53:35 +00:00
• a3c4a79fd0 Merge pull request 'fix: 添加调试log' (#78) from role into master wenhua 2024-04-01 01:53:04 +00:00
• fbae33730d fix: 添加调试log lilinyuan 2024-04-01 09:52:01 +08:00
• f395fa32c7 Merge pull request 'master' (#77) from master into prod wenhua 2024-03-30 16:36:50 +00:00
• 450d483f39 Merge pull request 'fix: 菜单分配父子联动' (#76) from role into master wenhua 2024-03-30 16:36:29 +00:00
• 64c735eb74 fix: 菜单分配父子联动 lilinyuan 2024-03-31 00:36:08 +08:00
• 57153d3bc7 Merge pull request 'master' (#75) from master into prod wenhua 2024-03-30 16:24:24 +00:00
• 699c7ecc7d Merge pull request 'fix: 同步退出登录后再登录不同权限账号时菜单不更新问题' (#74) from role into master wenhua 2024-03-30 16:24:00 +00:00
• ed0a5e1a7d fix: 同步退出登录后再登录不同权限账号时菜单不更新问题 lilinyuan 2024-03-31 00:23:31 +08:00
• 5b3a6b6bf4 Merge pull request 'master' (#73) from master into prod wenhua 2024-03-30 16:13:28 +00:00
• 0ffbdbbcc7 Merge pull request 'fix: 修复角色分配菜单父子关联不生效的问题' (#72) from role into master wenhua 2024-03-30 16:13:08 +00:00
• 7e0a065944 fix: 修复角色分配菜单父子关联不生效的问题 lilinyuan 2024-03-31 00:12:35 +08:00
• 6fbf040107 Merge pull request 'master' (#71) from master into prod odjbin 2024-03-30 14:59:49 +00:00
• d784928d05 Merge pull request 'fix : 修改登录框宽度' (#70) from dj into master odjbin 2024-03-30 14:59:26 +00:00
• a005409d92 fix : 修改登录框宽度 odjbin 2024-03-30 22:59:01 +08:00
• 6b81e35db0 Merge pull request 'master' (#69) from master into prod odjbin 2024-03-29 14:59:14 +00:00
• 7b500e7ea1 Merge pull request 'fix : 修改登录界面样式' (#68) from dj into master odjbin 2024-03-29 14:58:32 +00:00
• e9acf99ccb fix : 修改登录界面样式 odjbin 2024-03-29 22:58:00 +08:00
• e950d9e687 Merge pull request 'build : 修改dm发布' (#67) from master into dm clay 2024-03-29 12:54:05 +00:00
• dd659cf135 build : 修改dm发布 clay 2024-03-29 20:53:46 +08:00
• 736798b540 Merge pull request 'build : 修改dm发布' (#66) from master into dm clay 2024-03-29 12:50:19 +00:00
• 0c56e6a161 build : 修改dm发布 clay 2024-03-29 20:50:06 +08:00
• 190c77d71d Merge pull request 'build : 修改dm发布' (#65) from master into dm clay 2024-03-29 12:48:05 +00:00
• bba369abaa build : 修改dm发布 clay 2024-03-29 20:47:49 +08:00
• 6df354ec1b Merge pull request 'build : 修改dm发布' (#64) from master into dm clay 2024-03-29 12:45:11 +00:00
• fcff8c9cc4 build : 修改dm发布 clay 2024-03-29 20:44:33 +08:00
• 13d3428d7a build : 环境区分 clay 2024-03-29 18:22:23 +08:00
• 97578316b8 Merge pull request 'master' (#63) from master into prod clay 2024-03-29 10:10:54 +00:00
• 99cf83a563 Merge remote-tracking branch 'origin/master' clay 2024-03-29 18:10:33 +08:00
• f98103c61f build : 环境区分 clay 2024-03-29 18:10:26 +08:00
• 4c07528102 Merge pull request 'master' (#62) from master into prod wenhua 2024-03-29 09:14:52 +00:00
• 5986ab1eb4 Merge pull request 'fix: 生产环境禁用debugger' (#61) from role into master wenhua 2024-03-29 09:14:28 +00:00
• 2282f1c834 fix: 生产环境禁用debugger lilinyuan 2024-03-29 17:14:04 +08:00
• 065ef047a7 Merge pull request 'master' (#59) from master into prod wenhua 2024-03-29 08:50:13 +00:00
• ecf3fecd40 Merge pull request 'fix: 调整删除按钮展示逻辑' (#58) from uesr into master wenhua 2024-03-29 08:49:50 +00:00
• 658f7de3c0 fix: 调整删除按钮展示逻辑 uesr lilinyuan 2024-03-29 16:49:15 +08:00
• b5c5b9ec99 Merge pull request 'master' (#57) from master into prod wenhua 2024-03-29 07:47:14 +00:00