Merge remote-tracking branch 'origin/xinghong-dev'

java110

2022-04-13 3219ee5eb2c7de1e1401bd94cb4dc4d37195b244

 java110-bean/src/main/java/com/java110/dto/oaWorkflow/StencilsetJson.java

@@ -19,5 +19,5 @@
 * @desc add by 吴学文 11:31
 */
public class StencilsetJson {
    public String JSON = "";
    public static String JSON = "";
}