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

• 46a6745f17 Merge pull request 'role' (#56) from role into master wenhua 2024-03-29 07:46:43 +00:00
• d6ce782681 feat: 添加request lilinyuan 2024-03-29 15:45:14 +08:00
• aa3194dcc1 fix: 暂时删除request lilinyuan 2024-03-29 15:42:33 +08:00
• e418b588f6 fix: 修改request提示 lilinyuan 2024-03-29 15:41:21 +08:00
• a5a2e099a2 fix: 修改请求报错提示 lilinyuan 2024-03-29 15:34:34 +08:00
• 19822a539c fix: 修改tablecol显示bug lilinyuan 2024-03-29 15:34:17 +08:00
• fa56d63dbb Merge remote-tracking branch 'origin/master' clay 2024-03-29 15:21:02 +08:00
• 2ad0dbf8ab feat : 403 权限校验 clay 2024-03-29 15:20:52 +08:00
• 76824a5c57 Merge pull request 'master' (#53) from master into prod wenhua 2024-03-29 07:19:59 +00:00
• 89b42dba2a Merge pull request 'uesr' (#52) from uesr into master wenhua 2024-03-29 07:19:39 +00:00
• c28b0e306d fix: 调整user编辑逻辑OA用户只能修改角色 lilinyuan 2024-03-29 15:19:17 +08:00
• 75b0625dc4 Merge pull request 'master' (#51) from master into prod wenhua 2024-03-29 06:32:25 +00:00
• c88be616fc Merge pull request 'fix: 修复role新增编辑bug' (#50) from role into master wenhua 2024-03-29 06:32:08 +00:00
• 0fc918b576 fix: 修复role新增编辑bug lilinyuan 2024-03-29 14:31:45 +08:00
• 4585a4e49d Merge pull request 'master' (#49) from master into prod wenhua 2024-03-29 06:16:39 +00:00
• 38b5e2d2af Merge pull request 'role' (#48) from role into master wenhua 2024-03-29 06:15:51 +00:00
• 4c17bf7f6a fix: 修改默认用户名为super lilinyuan 2024-03-29 14:15:23 +08:00
• 878940c34b fix: 固定role列表操作列 lilinyuan 2024-03-29 14:15:04 +08:00
• b1b039a897 Merge pull request 'master' (#47) from master into uesr wenhua 2024-03-29 06:09:34 +00:00
• eb5b27fdf8 Merge pull request 'master' (#46) from master into prod wenhua 2024-03-29 06:07:55 +00:00
• 1e23fe08e3 Merge pull request 'fix: 修复role新增编辑bug, 调整列表页' (#45) from role into master wenhua 2024-03-29 06:07:24 +00:00
• 47a4c311af fix: 修复role新增编辑bug, 调整列表页 lilinyuan 2024-03-29 14:06:47 +08:00
• e8ab5fc050 Merge pull request 'master' (#44) from master into prod wenhua 2024-03-28 08:43:11 +00:00
• 5fc036d12d Merge pull request 'role' (#43) from role into master wenhua 2024-03-28 08:42:48 +00:00
• 51cf038bed feat: 角色crud对接完成 lilinyuan 2024-03-28 16:41:22 +08:00
• c412b8652d fix: tablelayout 改为auto lilinyuan 2024-03-28 16:40:48 +08:00
• 9df7674abc Merge pull request 'master' (#42) from master into prod wenhua 2024-03-28 01:34:34 +00:00
• 610b1a66b6 Merge pull request 'role' (#41) from role into master wenhua 2024-03-28 01:32:17 +00:00
• e8270fbe0b fix: 重构role lilinyuan 2024-03-27 17:30:52 +08:00
• 46765952e5 fix: 修复路由bug lilinyuan 2024-03-27 17:30:29 +08:00
• 21517a41a3 Merge pull request 'master' (#40) from master into prod wenhua 2024-03-27 06:22:52 +00:00
• 4eff7d3751 Merge pull request 'uesr' (#39) from uesr into master wenhua 2024-03-27 06:22:28 +00:00
• a22d80710b fix: 调整user列表编辑删除按钮显示 lilinyuan 2024-03-27 14:20:50 +08:00
• e1f5c48a6e fix: 优化user新增修改 lilinyuan 2024-03-27 14:20:23 +08:00
• 4449fcce60 Merge pull request 'master' (#38) from master into prod wenhua 2024-03-26 08:32:54 +00:00
• 73f5c4d493 Merge pull request 'uesr' (#37) from uesr into master wenhua 2024-03-26 08:32:30 +00:00
• 462c2e2110 feat: 完成user新增编辑详情接口对接 lilinyuan 2024-03-26 16:31:16 +08:00
• f782587b79 feat: 添加公共组件title lilinyuan 2024-03-26 16:30:53 +08:00
• 103b24fdb3 fix: 调整tagsViewvue文件 lilinyuan 2024-03-26 16:30:33 +08:00
• 03b9eae07d fix: 删除自定义指令consolelog lilinyuan 2024-03-26 16:30:13 +08:00
• ed0d51d47d fix: 调整组件 lilinyuan 2024-03-26 16:29:09 +08:00
• 82947fe5b6 fix: 调整tagsView文件 lilinyuan 2024-03-26 16:28:46 +08:00
• eda3b43e73 fix: 样式调整 lilinyuan 2024-03-26 16:28:15 +08:00
• 27c7b68595 Merge pull request 'master' (#36) from master into prod odjbin 2024-03-26 07:03:41 +00:00
• 08edc44670 Merge pull request 'fix : 细节优化' (#35) from dj into master odjbin 2024-03-26 06:47:51 +00:00
• 45f95fa297 fix : 细节优化 odjbin 2024-03-26 14:37:38 +08:00
• 306f92f4e5 Merge pull request 'master' (#34) from master into prod odjbin 2024-03-25 14:41:50 +00:00
• 203180100e Merge pull request 'fix : 细节优化' (#33) from dj into master odjbin 2024-03-25 14:41:39 +00:00
• 60f3c41124 fix : 细节优化 odjbin 2024-03-25 22:41:23 +08:00
• 51fe4e113b Merge pull request 'master' (#32) from master into prod odjbin 2024-03-25 14:39:51 +00:00
• 2b5bec709d Merge pull request 'fix : 细节优化' (#31) from dj into master odjbin 2024-03-25 14:39:38 +00:00
• 5d31b52e67 fix : 细节优化 odjbin 2024-03-25 22:39:25 +08:00
• 3bb0b9108c Merge pull request 'master' (#30) from master into prod odjbin 2024-03-25 12:42:35 +00:00
• 1278e8bef5 Merge pull request 'fix : 修复流程框点击bug' (#29) from dj into master odjbin 2024-03-25 12:42:25 +00:00
• f646c13e9d fix : 修复流程框点击bug odjbin 2024-03-25 20:41:51 +08:00
• b8aff8512d Merge pull request 'master' (#28) from master into prod odjbin 2024-03-25 10:01:07 +00:00
• 9fdacf9916 Merge pull request 'fix : 修复bug' (#27) from dj into master odjbin 2024-03-25 10:00:54 +00:00
• 4d82ec56ea fix : 修复bug odjbin 2024-03-25 18:00:32 +08:00
• 6ec24f7431 Merge pull request 'master' (#26) from master into prod odjbin 2024-03-25 09:09:50 +00:00
• 4370687945 Merge pull request 'fix : 修复工作流流程新增bug' (#25) from dj into master odjbin 2024-03-25 09:09:31 +00:00
• 1c93a97d58 fix : 修复工作流流程新增bug odjbin 2024-03-25 17:08:48 +08:00
• d4373bc44f Merge pull request 'master' (#24) from master into prod wenhua 2024-03-25 02:57:52 +00:00
• 5cdfa2d7cf Merge pull request 'fix: 修改整体样式' (#23) from uesr into master wenhua 2024-03-25 02:57:28 +00:00
• 340ec0161d fix: 修改整体样式 lilinyuan 2024-03-25 10:56:50 +08:00
• d0c20d68eb Merge pull request 'master' (#22) from master into prod wenhua 2024-03-24 15:05:37 +00:00
• 7b707f4ff3 Merge pull request 'uesr' (#21) from uesr into master wenhua 2024-03-24 15:05:04 +00:00
• 3efca32dbf feat: 新增页面缓存 lilinyuan 2024-03-24 23:00:34 +08:00
• 365c4c9d69 feat: 添加路由参数 lilinyuan 2024-03-24 23:00:09 +08:00
• bb51b21210 fix: 修复user页面查询bug lilinyuan 2024-03-24 22:57:10 +08:00
• ad808d6fa6 Merge pull request 'master' (#20) from master into prod wenhua 2024-03-20 06:11:28 +00:00
• 5f867b1e0d Merge pull request 'uesr' (#19) from uesr into master wenhua 2024-03-20 06:11:06 +00:00
• 21d5969ceb fix: 修改user页面搜索配置 lilinyuan 2024-03-20 14:10:07 +08:00
• 772b66749d fix: 调整搜索组件样式 lilinyuan 2024-03-20 11:06:55 +08:00
• ac92da76aa Merge pull request 'master' (#18) from master into prod wenhua 2024-03-19 09:15:28 +00:00
• 28d38d84b0 Merge pull request 'uesr' (#17) from uesr into master wenhua 2024-03-19 09:15:01 +00:00
• a6c1cd81f1 feat: 新增暴露roles lilinyuan 2024-03-19 17:13:13 +08:00
• 95b33a32bd feat: 重构user lilinyuan 2024-03-19 17:12:58 +08:00
• 170e758893 feat: 导入组件 lilinyuan 2024-03-19 17:12:41 +08:00
• 9bc14be710 feat: 添加接口 lilinyuan 2024-03-19 17:12:19 +08:00
• bc266b8d50 feat: 配置自动引入组件 lilinyuan 2024-03-19 17:12:06 +08:00
• 20c913f61f Merge pull request 'master' (#16) from master into prod odjbin 2024-03-18 07:43:36 +00:00
• 9fba994dd5 Merge pull request 'feat : 新增子公司和部门界面全部展开/收起功能' (#15) from dj into master odjbin 2024-03-18 07:43:29 +00:00
• d13f8d5501 feat : 新增子公司和部门界面全部展开/收起功能 odjbin 2024-03-18 15:43:09 +08:00
• f25e74869b Merge pull request 'master' (#14) from master into prod odjbin 2024-03-18 07:25:56 +00:00
• 4729aa66a2 Merge pull request 'feat : 新增子公司和部门界面' (#13) from dj into master odjbin 2024-03-18 07:25:48 +00:00
• bcb0509978 feat : 新增子公司和部门界面 odjbin 2024-03-18 15:25:31 +08:00
• 09028a2041 Merge pull request 'feat : 添加表单设置页面' (#12) from master into prod clay 2024-03-12 03:43:38 +00:00
• 1db444e87c Merge pull request 'feat : 添加表单设置页面' (#11) from clay into master clay 2024-03-12 03:43:23 +00:00
• c0aec3c33e feat : 添加表单设置页面 clay 2024-03-12 11:41:27 +08:00
• 0a9d2fbfc1 Merge pull request 'master' (#10) from master into prod odjbin 2024-03-08 02:28:16 +00:00
• f5be136384 Merge pull request 'fix : 修复铃铛信息框bug' (#9) from dj into master odjbin 2024-03-08 02:28:02 +00:00
• 60a31415d1 fix : 修复铃铛信息框bug odjbin 2024-03-08 10:27:33 +08:00
• 901cf7fbc4 Merge pull request 'master' (#8) from master into prod odjbin 2024-03-05 14:14:37 +00:00
• 6b86078626 Merge pull request 'dj' (#7) from dj into master odjbin 2024-03-05 14:14:28 +00:00
• 565c976f7f fix : 修复loading加载 odjbin 2024-03-05 22:13:36 +08:00
• 25bcededa0 fix : 修复loading加载 odjbin 2024-03-05 21:58:53 +08:00
• bd9d0a43c2 Merge pull request 'master' (#6) from master into prod odjbin 2024-03-05 13:55:11 +00:00
• be0f81bfed Merge pull request 'fix : 修复loading加载' (#5) from dj into master odjbin 2024-03-05 13:54:52 +00:00
• bfbc77847a fix : 修复loading加载 odjbin 2024-03-05 21:54:30 +08:00
• 9eb481be57 Merge pull request 'master' (#4) from master into prod odjbin 2024-03-05 12:49:36 +00:00