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

# Conflicts:
#	src/custom/restcontroller/webmanage/sale/item/Item.java

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -653,6 +653,8 @@ public class Item extends Controller {
         querySQL.addQueryFields("price5", "t13.price ");
         querySQL.addJoinTable(JOINTYPE.left, "plm_itemclass", "t14", "t14.itemclassid = t1.marketingcategory AND t14.siteid = t1.siteid",
                 "itemclassname");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_department", "t16", "t16.departmentid = t1.departmentid AND t16.siteid = t1.siteid",
+                "depno","depname");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
         return querySQL;

src/custom/restcontroller/webmanage/sale/itempriceadjust/ItempriceadjustItemprice.java

@@ -1,6 +1,7 @@
 package restcontroller.webmanage.sale.itempriceadjust;
 
 import beans.datacontrllog.DataContrlLog;
+import beans.itemprice.ItemPrice;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
@@ -34,7 +35,7 @@ public class ItempriceadjustItemprice extends Controller {
     }
 
     @API(title = "商品调价单商品明细新增或更新", apiversion = R.ID20221025095104.v1.class, intervaltime = 200)
-    @CACHEING_CLEAN(apiversions = {R.ID20221025160904.v1.class})
+    @CACHEING_CLEAN(apiversions = {ItempriceadjustItemprice.class, Itempriceadjust.class})
     public String insertOrUpdate_sa_itempriceadjust_itemprice() throws YosException {
         Long sa_itempriceadjustid = content.getLong("sa_itempriceadjustid");
         Rows sa_itempriceadjustrow = dbConnect.runSqlQuery("select sa_itempriceadjustid,status,billno from sa_itempriceadjust where sa_itempriceadjustid=" + sa_itempriceadjustid + " and siteid='" + siteid + "'");