Merge branch 'develop' into release

pom.xml

@@ -368,6 +368,12 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-customerManagement</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
 
             <!--  工作流模块  -->
             <dependency>

ruoyi-admin/pom.xml

@@ -80,6 +80,11 @@
             <artifactId>ruoyi-commodityManagement</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-customerManagement</artifactId>
+        </dependency>
+
         <!-- 代码生成-->
         <dependency>
             <groupId>org.dromara</groupId>

ruoyi-modules/pom.xml

@@ -18,6 +18,7 @@
         <module>ruoyi-bulkOrder</module>
         <module>ruoyi-developmentManagement</module>
         <module>ruoyi-commodityManagement</module>
+        <module>ruoyi-customerManagement</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/ShaoHuaController.java

@@ -26,6 +26,7 @@ public class ShaoHuaController extends BaseController {
      * @param shaoHua 烧花BO对象
      * @return 烧花单价
      */
+    @SaIgnore
     @PutMapping()
     public R<Void> updateShaoHua(@RequestBody ShaoHuaBo shaoHua) {
         return toAjax(shaoHuaService.updateShaoHua(shaoHua));

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/ShaoHua.java

@@ -8,21 +8,13 @@ import org.dromara.common.tenant.core.TenantEntity;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("fa_kuyou_sets")
+@TableName("fa_kuyou_shaohua_price")
 public class ShaoHua extends TenantEntity {
     /**
      * 烧花ID
      */
     @TableId("id")
-    private Long id;
-    /**
-     * 烧花英文名称
-     */
-    private String name;
-    /**
-     * 烧花中文名称
-     */
-    private String nikename;
+    private int id=1;
     /**
      * 烧花单价
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/ShaoHuaBo.java

@@ -18,15 +18,7 @@ public class ShaoHuaBo extends BaseEntity {
      * 烧花ID
      */
     @TableId("id")
-    private Long id;
-    /**
-     * 烧花英文名称
-     */
-    private String name;
-    /**
-     * 烧花中文名称
-     */
-    private String nikename;
+    private int id=1;
     /**
      * 烧花单价
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/ShaoHuaVo.java

@@ -18,15 +18,7 @@ public class ShaoHuaVo extends BaseEntity {
      * 烧花ID
      */
     @TableId("id")
-    private Long id;
-    /**
-     * 烧花英文名称
-     */
-    private String name;
-    /**
-     * 烧花中文名称
-     */
-    private String nikename;
+    private int id=1;
     /**
      * 烧花单价
      */

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/Customer.java

@@ -58,4 +58,8 @@ public class Customer extends TenantEntity {
      * 账单结算类型
      */
     private String bill_type;
+    /**
+     * 总公司id
+     */
+    private Long pid;
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/bo/CustomerBo.java

@@ -57,4 +57,8 @@ public class CustomerBo extends BaseEntity {
      * 账单结算类型
      */
     private String bill_type;
+    /**
+     * 总公司id
+     */
+    private Long pid;
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/vo/CustomerVo.java

@@ -56,4 +56,8 @@ public class CustomerVo extends BaseEntity {
      * 账单结算类型
      */
     private String bill_type;
+    /**
+     * 总公司id
+     */
+    private Long pid;
 }