Merge remote-tracking branch 'origin/ecp' into ecp

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/fc/customer/dto/FcCustomerDescDto.java

@@ -0,0 +1,13 @@
+package com.gubersail.dealer.admin.api.fc.customer.dto;
+
+import com.gubersail.dealer.admin.api.fc.customer.entity.FcCustomerDesc;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author Rain
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class FcCustomerDescDto extends FcCustomerDesc {
+}

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/fc/customer/entity/FcCustomerDesc.java

@@ -0,0 +1,122 @@
+package com.gubersail.dealer.admin.api.fc.customer.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author Rain
+ */
+@Data
+public class FcCustomerDesc implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+
+	/**
+	 * 主键ID
+	 */
+	private Long id;
+
+	/**
+	 * 租户ID
+	 */
+	private String tenantId;
+
+	/**
+	 * 创建人
+	 */
+	private Long createUser;
+
+	/**
+	 * 创建部门
+	 */
+	private Long createDept;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+	/**
+	 * 修改人
+	 */
+	private Long updateUser;
+
+	/**
+	 * 修改时间
+	 */
+	private Date updateTime;
+
+	/**
+	 * 是否已删除（0否 1是）
+	 */
+	private Integer isDeleted;
+
+	/**
+	 * 备注
+	 */
+	private String remarks;
+
+	/**
+	 * 状态
+	 */
+	private String status;
+
+	/**
+	 * 是否启用（0启用，1停用）
+	 */
+	private Integer enableOrNot;
+
+	/**
+	 * 客户名称
+	 */
+	private String cname;
+
+	/**
+	 * 电话
+	 */
+	private String tel;
+
+	/**
+	 * 商城价格
+	 */
+	private String priceSystem;
+
+	/**
+	 * 客户类型
+	 */
+	private String corpType;
+
+	/**
+	 * 业务员ID
+	 */
+	private Long salesmanId;
+
+	/**
+	 * 业务员名称
+	 */
+	private String salesmanName;
+
+	/**
+	 * 所属公司ID
+	 */
+	private Long salesCompanyId;
+
+	/**
+	 * 所属公司名称
+	 */
+	private String salesCompanyName;
+
+	/**
+	 * 首字母
+	 */
+	private String initials;
+
+	/**
+	 * 客户状态
+	 */
+	private String checkStatus;
+}

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/fc/customer/vo/FcCustomerDescVo.java

@@ -0,0 +1,13 @@
+package com.gubersail.dealer.admin.api.fc.customer.vo;
+
+import com.gubersail.dealer.admin.api.fc.customer.entity.FcCustomerDesc;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author Rain
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class FcCustomerDescVo extends FcCustomerDesc {
+}

blade-service/blade-u9cloud/src/main/java/org/springblade/u9cloud/service/impl/ZcrmViewCustomerSelServiceImpl.java

@@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.user.feign.IUserClient;
-import org.springblade.system.user.feign.UserClient;
 import org.springblade.u9cloud.common.U9cloudGetTokenUtil;
 import org.springblade.u9cloud.entity.ViewApiResponse;
 import org.springblade.u9cloud.entity.ZcrmViewCustomerSel;

blade-service/gubersail-dealer-admin/pom.xml

@@ -12,6 +12,12 @@
     <groupId>com.gubersail.dealer.admin</groupId>
     <artifactId>gubersail-dealer-admin</artifactId>
 
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <dependencies>
         <!--Blade-->
         <dependency>
@@ -102,11 +108,4 @@
 
     </dependencies>
 
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
 </project>

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/fc/customer/controller/FcCustomerDescController.java

@@ -0,0 +1,16 @@
+package com.gubersail.admin.fc.customer.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Rain
+ */
+@RestController
+@RequestMapping("/fc/customer/")
+public class FcCustomerDescController {
+
+
+
+
+}

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/fc/customer/impl/FcCustomerDescServiceImpl.java

@@ -0,0 +1,14 @@
+package com.gubersail.admin.fc.customer.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gubersail.admin.fc.customer.mapper.FcCustomerDescMapper;
+import com.gubersail.admin.fc.customer.service.FcCustomerDescService;
+import com.gubersail.dealer.admin.api.fc.customer.entity.FcCustomerDesc;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Rain
+ */
+@Service
+public class FcCustomerDescServiceImpl extends ServiceImpl<FcCustomerDescMapper, FcCustomerDesc> implements FcCustomerDescService {
+}

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/fc/customer/mapper/FcCustomerDescMapper.java

@@ -0,0 +1,10 @@
+package com.gubersail.admin.fc.customer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gubersail.dealer.admin.api.fc.customer.entity.FcCustomerDesc;
+
+/**
+ * @author Rain
+ */
+public interface FcCustomerDescMapper extends BaseMapper<FcCustomerDesc> {
+}

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/fc/customer/service/FcCustomerDescService.java

@@ -0,0 +1,10 @@
+package com.gubersail.admin.fc.customer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gubersail.dealer.admin.api.fc.customer.entity.FcCustomerDesc;
+
+/**
+ * @author Rain
+ */
+public interface FcCustomerDescService extends IService<FcCustomerDesc> {
+}