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

src/custom/restcontroller/webmanage/role/role.java

@@ -309,7 +309,11 @@ public class role extends Controller {
             }
         }
         dbConnect.runSqlUpdate(sqllist);
-        logroleout(roleid);
+        try {
+            logroleout(roleid);
+        } catch (Exception e) {
+            logger.error(e);
+        }
         return getSucReturnObject().toString();
     }
 

src/custom/restcontroller/webmanage/sale/salestarget/enterprisetarget.java

@@ -452,7 +452,7 @@ public class enterprisetarget extends Controller {
 //    }
 
     @API(title = "查询对应企业的年度", apiversion = R.ID20230103102302.v1.class)
-    public String getYear() throws YosException {
+    public String getyear() throws YosException {
 
         Long sys_enterpriseid = content.getLong("sys_enterpriseid");