Merge remote-tracking branch 'serve/day-05' into day-05

# Conflicts:
#	muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
#	muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java

muyu-common/muyu-common-system/pom.xml

@@ -23,5 +23,9 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-security</artifactId>
+        </dependency>
     </dependencies>
 </project>

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/结构

@@ -109,7 +109,36 @@ updateTime: "2024-03-10 16:06:52"
 
 
 
-
+{
+    "product": {
+        "id":null,
+        "name":null,
+        "states":null,
+        "brandId":null,
+        "remark":null,
+        "image":null,
+        "imgs":null,
+    },
+    "attributeGroupList":[
+        {
+            "id":null
+        }
+    ],
+    "attributeList":[
+        {
+            "attributeId":null,
+            "attributeValue":bull
+        }
+    ],
+    "rule":[
+        {
+            "sku":null,    ("1,2,3")
+            "image":null,
+            "inventoryValue":null,
+            "priceValue":null
+        }
+    ]
+}
 
 
 

pom.xml

@@ -218,6 +218,10 @@
                 <version>${muyu.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+            </dependency>
 
 
         </dependencies>