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

# Conflicts:
#	src/custom/restcontroller/sale/itemgroup/itemgroup.java

src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -54,7 +54,6 @@ public class itemgroup extends Controller {
     @API(title = "查询", apiversion = R.ID20220926142203.v1.class)
     @CACHEING
     public String queryItemgroup() throws YosException {
-
         if (content.containsKey("sys_enterpriseid")) {
             sys_enterpriseid = content.getLongValue("sys_enterpriseid");
         }