From 5512b2224479cb33d095a537cc31632436a39972 Mon Sep 17 00:00:00 2001
From: majian314 <hi34384320@aliyun.com>
Date: Sun, 28 Sep 2025 17:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=95=86=E5=92=8C=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E5=A2=9E=E5=8A=A0=E7=BB=9F=E4=B8=80=E7=A4=BE=E4=BC=9A?=
 =?UTF-8?q?=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/operation/domain/Company.java | 2 +-
 .../java/com/ruoyi/operation/domain/CompanyStore.java     | 2 +-
 .../main/resources/templates/operation/company/add.html   | 6 ++++++
 .../resources/templates/operation/company/company.html    | 4 ++--
 .../main/resources/templates/operation/company/edit.html  | 6 ++++++
 .../src/main/resources/templates/operation/store/add.html | 6 ++++++
 .../main/resources/templates/operation/store/edit.html    | 8 +++++++-
 7 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/Company.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/Company.java
index ba2a5b6..7dc5353 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/Company.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/Company.java
@@ -167,7 +167,7 @@ public class Company extends BaseEntity
     /** 统一信用代码 */
     private String extend1;
 
-    /** 营业执照上的名称 */
+    /** 统一社会信用机构名称 */
     private String extend2;
 
     /**  */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
index 116ea57..2dbeaa4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
@@ -179,7 +179,7 @@ public class CompanyStore extends BaseEntity
     /** 统一信用代码 */
     private String extend2;
 
-    /** 营业执照上的名称 */
+    /** 统一社会信用机构名称 */
     private String extend3;
 
     /**  */
diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/add.html b/ruoyi-admin/src/main/resources/templates/operation/company/add.html
index 55e881b..230903c 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/company/add.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/company/add.html
@@ -95,6 +95,12 @@
                     <input name="extend1" class="form-control" type="text"  maxlength="30" required>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">统一社会信用机构名称：</label>
+                <div class="col-sm-8">
+                    <input name="extend2" class="form-control" type="text"  maxlength="30" required>
+                </div>
+            </div>
            
         </form>
     </div>
diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/company.html b/ruoyi-admin/src/main/resources/templates/operation/company/company.html
index 7fced44..1eaff60 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/company/company.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/company/company.html
@@ -39,7 +39,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="operation:company:add">
+                <a class="btn btn-success" onclick="$.operate.addCustomize(null,900,800)" shiro:hasPermission="operation:company:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
 <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="operation:company:edit">-->
@@ -138,7 +138,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="addCompanyUser(\'' + row.id + '\')"><i class="fa fa-edit"></i>运营商用户</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>修改</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + ' btnOption" href="javascript:void(0)" onClick="$.operate.editCustomize(\''+row.id+'\', 900, 800)""><i class="fa fa-edit"></i>修改</a> ');
                         if (row.status == 1) {
                             actions.push('<a class="btn btn-success btn-xs ' + removeFlag + ' btnOption" href="javascript:void(0)" onclick="enable(\'' + row.id + '\',\'' + row.phone + '\')"><i class="fa fa-edit"></i>启用</a> ');
                         } else {
diff --git a/ruoyi-admin/src/main/resources/templates/operation/company/edit.html b/ruoyi-admin/src/main/resources/templates/operation/company/edit.html
index 7db83bc..17f553f 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/company/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/company/edit.html
@@ -92,6 +92,12 @@
                     <input name="extend1" th:field="*{extend1}"class="form-control" type="text"  maxlength="30" required>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">统一社会信用机构名称：</label>
+                <div class="col-sm-8">
+                    <input name="extend2" th:field="*{extend2}" class="form-control" type="text"  maxlength="50" required>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/add.html b/ruoyi-admin/src/main/resources/templates/operation/store/add.html
index 759964f..c1cfe1d 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/store/add.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/store/add.html
@@ -163,6 +163,12 @@
                     <input name="extend2" class="form-control" type="text"  maxlength="30" required>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">统一社会信用机构名称：</label>
+                <div class="col-sm-8">
+                    <input name="extend3" class="form-control" type="text"  maxlength="50" required>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">门店图片：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html
index ef9abc3..ba30c8f 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html
@@ -160,7 +160,13 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">统一社会信用代码：</label>
             <div class="col-sm-8">
-                <input name="extend2" th:field="*{extend2}"class="form-control" type="text"  maxlength="30" required>
+                <input name="extend2" th:field="*{extend2}" class="form-control" type="text"  maxlength="30" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">统一社会信用机构名称：</label>
+            <div class="col-sm-8">
+                <input name="extend3" th:field="*{extend3}" class="form-control" type="text"  maxlength="50" required>
             </div>
         </div>
         <div class="form-group">