Merge branch 'v4.9.6_ws' of qmx/jy into feature/v4.9.6

src/jfw/modules/publicapply/src/detail/consts/consts.go

@@ -49,7 +49,7 @@ var (
 	AheadCacheKey       = "jyahead_%s_%s"
 	PSCacheKey          = "jydetail_project_schedule_%s"
 	QyxyEntNameCacheKey = "jydetail_qyxy_%s"
-	CustomerCacheKey    = "jydetail_customer_%s_%s"
+	CustomerCacheKey    = "jydetail_customer_%s_%s_%s"
 	TokenLen            = 5
 	TypeCodeMap         = map[string]string{
 		"拟建":   "拟建项目",

src/jfw/modules/publicapply/src/detail/dao/customer.go

@@ -59,7 +59,7 @@ func (c *Customer) GetCustomer() (es *entity.CustomerS) {
 		More:    false,
 		List:    nil,
 	}
-	customerCacheKey := fmt.Sprintf(consts.CustomerCacheKey, c.UserId, c.Id)
+	customerCacheKey := fmt.Sprintf(consts.CustomerCacheKey, c.UserId, c.Id, common.If(c.IsMobile, "mobile", "pc").(string))
 	var customerFunc = func() {
 		//其他客户信息
 		otherCustomers := c.OtherCustomers()