Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案更新.sql

@@ -1,7 +1,6 @@
 UPDATE plm_item
 SET changeuserid=$userid$,
     changedate = current_time,
-    itemno=$itemno$,
     unitid=$unitid$,
     isauxunit=$isauxunit$,
     unitgroupid=$unitgroupid$,