‘linchangsheng’ il y a 5 mois
Parent
commit
18d56e9d22

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/DispatchVO.java

@@ -66,11 +66,11 @@ public class DispatchVO {
 
 
     @ZfireField(tbName = "e",colName = "dict_value")
-    @ApiModelProperty(value = "承接渠道")
+    @ApiModelProperty(value = "销售类型")
     private String saleTypeName;
 
     @ZfireField(tbName = "e",hide = true,colName = "dict_code")
-    @ApiModelProperty(value = "承接渠道")
+    @ApiModelProperty(value = "销售类型")
     private String saleTypeId;
 
 

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/WebsitDispatchVO.java

@@ -56,10 +56,10 @@ public class WebsitDispatchVO    {
     @ApiModelProperty(value = "产品大类id")
     private String categoryId;
 
-    @ApiModelProperty(value = "承接渠道")
+    @ApiModelProperty(value = "销售类型")
     private String saleTypeName;
     @ZfireField(hide = true)
-    @ApiModelProperty(value = "承接渠道id")
+    @ApiModelProperty(value = "销售类型")
     private String saleTypeId;
 
     @ApiModelProperty(value = "网点编号")

+ 4 - 4
mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/NoticeWebsitLogic.java

@@ -67,11 +67,11 @@ public class NoticeWebsitLogic {
 
     public void add(NoticeWebsitBean noticeBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        noticeBean.setAdminCompanyId(adminUser.getCompanyWechatId());
+        noticeBean.setCompanyWechatId(adminUser.getCompanyWechatId());
         noticeBean.setIssueNickName(adminUser.getNickName());
         noticeBean.setIssueTime(new Date());
         noticeBean.setIssueUserId(adminUser.getAdminUserId());
-        noticeBean.setAdminCompanyName(adminUser.getCompanyName());
+        noticeBean.setCompanyWechatName(adminUser.getCompanyName());
         noticeBean.insert();
 
         List<NoticeWebsitRecord> noticeWebsitRecords = new ArrayList<>();
@@ -97,8 +97,8 @@ public class NoticeWebsitLogic {
     public void update(NoticeWebsitBean noticeBean) {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        noticeBean.setAdminCompanyId(adminUser.getCompanyWechatId());
-        noticeBean.setAdminCompanyName(adminUser.getCompanyName());
+        noticeBean.setCompanyWechatId(adminUser.getCompanyWechatId());
+        noticeBean.setCompanyWechatName(adminUser.getCompanyName());
         noticeBean.updateById();
 
         List<NoticeWebsitRecord> noticeWebsitRecords = new ArrayList<>();